diff --git a/IPython/Extensions/InterpreterExec.py b/IPython/Extensions/InterpreterExec.py index 0db6571..943023f 100644 --- a/IPython/Extensions/InterpreterExec.py +++ b/IPython/Extensions/InterpreterExec.py @@ -5,7 +5,7 @@ We define a special input line filter to allow typing lines which begin with '~', '/' or '.'. If one of those strings is encountered, it is automatically executed. -$Id: InterpreterExec.py 1039 2006-01-20 23:59:33Z vivainio $""" +$Id: InterpreterExec.py 1041 2006-01-21 09:29:14Z vivainio $""" #***************************************************************************** # Copyright (C) 2004 W.J. van der Laan @@ -244,18 +244,18 @@ __IPYTHON__.default_option('cd','-q') # This is redundant, ipy_user_conf.py will determine this # Load all of $PATH as aliases -#if os.name == 'posix': +if os.name == 'posix': # # %rehash is very fast, but it doesn't check for executability, it simply # # dumps everything in $PATH as an alias. Use rehashx if you want more # # checks. -# __IPYTHON__.magic_rehash() -#else: + __IPYTHON__.magic_rehash() +else: # # Windows users: the list of extensions considered executable is read from # # the environment variable 'pathext'. If this is undefined, IPython # # defaults to EXE, COM and BAT. # # %rehashx is the one which does extension analysis, at the cost of # # being much slower than %rehash. -# __IPYTHON__.magic_rehashx() + __IPYTHON__.magic_rehashx() # Remove %sc,%sx if present as aliases __IPYTHON__.magic_unalias('sc') diff --git a/IPython/UserConfig/ipy_user_conf.py b/IPython/UserConfig/ipy_user_conf.py index 92b5fd6..2b319eb 100644 --- a/IPython/UserConfig/ipy_user_conf.py +++ b/IPython/UserConfig/ipy_user_conf.py @@ -40,10 +40,11 @@ ip.magic('alias d ls -F --color=auto') # Make available all system commands through "rehashing" immediately. # You can comment these lines out to speed up startup on very slow -# machines, and to conserve a bit of memory. - -if os.name=='posix': - ip.magic('rehash') -else: - #slightly slower, but better results esp. with Windows - ip.magic('rehashx') +# machines, and to conserve a bit of memory. Note that pysh profile does this +# automatically + +#if os.name=='posix': +# ip.magic('rehash') +#else: +# #slightly slower, but better results esp. with Windows +# ip.magic('rehashx') diff --git a/IPython/ipmaker.py b/IPython/ipmaker.py index cfc63d7..ce281f7 100644 --- a/IPython/ipmaker.py +++ b/IPython/ipmaker.py @@ -6,7 +6,7 @@ Requires Python 2.1 or better. This file contains the main make_IPython() starter function. -$Id: ipmaker.py 1037 2006-01-20 23:27:53Z vivainio $""" +$Id: ipmaker.py 1041 2006-01-21 09:29:14Z vivainio $""" #***************************************************************************** # Copyright (C) 2001-2006 Fernando Perez. @@ -608,7 +608,8 @@ object? -> Details about 'object'. ?object also works, ?? prints more. import ipy_user_conf except ImportError: - IP.InteractiveTB() + pass + #IP.InteractiveTB() XXX uncomment in a later release # release stdout and stderr and save config log into a global summary msg.config.release_all()