Show More
@@ -1,7 +1,7 b'' | |||
|
1 | 1 | # -*- coding: utf-8 -*- |
|
2 | 2 | """Magic functions for InteractiveShell. |
|
3 | 3 | |
|
4 |
$Id: Magic.py 13 |
|
|
4 | $Id: Magic.py 1351 2006-06-05 13:43:18Z vivainio $""" | |
|
5 | 5 | |
|
6 | 6 | #***************************************************************************** |
|
7 | 7 | # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and |
@@ -2421,7 +2421,7 b' Defaulting color scheme to \'NoColor\'"""' | |||
|
2421 | 2421 | for pdir in path: |
|
2422 | 2422 | os.chdir(pdir) |
|
2423 | 2423 | for ff in os.listdir(pdir): |
|
2424 | if isexec(ff): | |
|
2424 | if isexec(ff) and ff not in self.shell.no_alias: | |
|
2425 | 2425 | # each entry in the alias table must be (N,name), |
|
2426 | 2426 | # where N is the number of positional arguments of the |
|
2427 | 2427 | # alias. |
@@ -2431,7 +2431,7 b' Defaulting color scheme to \'NoColor\'"""' | |||
|
2431 | 2431 | for pdir in path: |
|
2432 | 2432 | os.chdir(pdir) |
|
2433 | 2433 | for ff in os.listdir(pdir): |
|
2434 | if isexec(ff): | |
|
2434 | if isexec(ff) and os.path.splitext(ff)[0] not in self.shell.no_alias: | |
|
2435 | 2435 | alias_table[execre.sub(r'\1',ff)] = (0,ff) |
|
2436 | 2436 | syscmdlist.append(ff) |
|
2437 | 2437 | # Make sure the alias table doesn't contain keywords or builtins |
@@ -1,3 +1,8 b'' | |||
|
1 | 2006-06-05 Ville Vainio <vivainio@gmail.com> | |
|
2 | ||
|
3 | * Magic.py (magic_rehashx): Honor no_alias list earlier in | |
|
4 | %rehashx, to avoid clobbering builtins in ipy_profile_sh.py | |
|
5 | ||
|
1 | 6 | 2006-06-03 Fernando Perez <Fernando.Perez@colorado.edu> |
|
2 | 7 | |
|
3 | 8 | * IPython/genutils.py (ask_yes_no): treat EOF as a default answer |
General Comments 0
You need to be logged in to leave comments.
Login now