- Fixes to sys.path to better match a plain Python console.

IPython/iplib.py

@@ -6,7 +6,7 b' Requires Python 2.3 or newer.'
 
 This file contains all the classes and helper functions specific to IPython.
 
-$Id: iplib.py 1868 2006-11-02 15:29:10Z vivainio $
+$Id: iplib.py 1874 2006-11-03 08:17:34Z fptest $
 """
 
 #*****************************************************************************
@@ -2381,11 +2381,6 b' want to merge them back into the new files.""" % locals()'
     def safe_execfile(self,fname,*where,**kw):
         fname = os.path.expanduser(fname)
 
-        # find things also in current directory
-        dname = os.path.dirname(fname)
-        if not sys.path.count(dname):
-            sys.path.append(dname)
-
         try:
             xfile = open(fname)
         except:

doc/ChangeLog

@@ -1,5 +1,9 b''
 2006-11-03  Fernando Perez  <[e-mail]>
 
+	* scripts/ipython: remove the very first entry in sys.path which
+	Python auto-inserts for scripts, so that sys.path under IPython is
+	as similar as possible to that under plain Python.
+
 	* IPython/completer.py (IPCompleter.file_matches): Fix
 	tab-completion so that quotes are not closed unless the completion
 	is unambiguous.  After a request by Stefan.  Minor cleanups in

ipython.py

@@ -7,6 +7,12 b" in './scripts' directory. This file is here (ipython source root directory)"
 to facilitate non-root 'zero-installation' (just copy the source tree
 somewhere and run ipython.py) and development. """
 
+# Start by cleaning up sys.path: Python automatically inserts the script's
+# base directory into sys.path, at the front.  This can lead to unpleasant
+# surprises.
+import sys
+sys.path.pop(0)
+
 import IPython
 
 IPython.Shell.start().mainloop()

scripts/ipython

@@ -23,6 +23,11 b' this mode, there is no way to pass IPython any command-line options, as those'
 are trapped first by Python itself.
 """
 
-import IPython
+# Start by cleaning up sys.path: Python automatically inserts the script's
+# base directory into sys.path, at the front.  This can lead to unpleasant
+# surprises.
+import sys
+sys.path.pop(0)
 
+import IPython
 IPython.Shell.start().mainloop()