Set up sys.path properly. Also don't read PYTHONSTARTUP when executed with -i.

Trundle · Trundle · commit b674ff5e168e · 2010-01-03T22:25:25.000+01:00
The latter to be consistent with Python. This closes issue #88.
diff --git a/bpython/args.py b/bpython/args.py
@@ -101,5 +101,6 @@ def exec_code(interpreter, args):
     with open(args[0], 'r') as sourcefile:
         code_obj = compile(sourcefile.read(), args[0], 'exec')
     old_argv, sys.argv = sys.argv, args
+    sys.path.insert(0, os.path.abspath(os.path.dirname(args[0])))
     interpreter.runcode(code_obj)
     sys.argv = old_argv
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1548,13 +1548,14 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
     sys.stdout = repl
     sys.stderr = repl
 
-    repl.startup()
-
     if args:
         bpython.args.exec_code(interpreter, args)
         if not interactive:
             curses.raw(False)
             return repl.getstdout()
+    else:
+        sys.path.insert(0, '')
+        repl.startup()
 
     if banner is not None:
         repl.write(banner)
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -637,7 +637,10 @@ def main(args=None):
     sys.stdout = repl_widget
 
     gobject.idle_add(init_import_completion)
-    gobject.idle_add(repl_widget.startup)
+
+    if not args:
+        sys.path.insert(0, '')
+        gobject.idle_add(repl_widget.startup)
 
     if not options.socket_id:
         parent = gtk.Window()
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -296,7 +296,6 @@ def __init__(self, interp, config, idle=None):
         self.list_win_visible = False
         self._C = {}
         self.prev_block_finished = 0
-        sys.path.insert(0, '.')
 
         pythonhist = os.path.expanduser(self.config.hist_file)
         if os.path.exists(pythonhist):
diff --git a/doc/bpython.1 b/doc/bpython.1
@@ -70,6 +70,7 @@ Show the help message and exit.
 .IP "\fB\-\-interactive\fR" 4
 .PD
 Drop to bpython shell after running \fIfile\fR instead of exiting.
+The PYTHONSTARTUP file is not read.
 .IP "\fB\-q\fR" 4
 .PD 0
 .IP "\fB\-\-quiet\fR" 4
