merge in PYTHONSTARTUP-encoding-fix

bobf · bobf · commit 7bcace45b882 · 2009-12-30T10:16:15.000Z
diff --git a/bpython/args.py b/bpython/args.py
@@ -3,6 +3,7 @@
 """
 from __future__ import with_statement
 
+from __future__ import with_statement
 import os
 import sys
 import code
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1545,6 +1545,8 @@ 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:
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -636,6 +636,8 @@ def main(args=None):
     sys.stderr = repl_widget
     sys.stdout = repl_widget
 
+#    repl.startup()
+
     gobject.idle_add(init_import_completion)
 
     if not options.socket_id:
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -67,9 +67,11 @@ def __init__(self, locals=None, encoding=sys.getdefaultencoding()):
 
     if not py3:
 
-        def runsource(self, source, filename='<input>', symbol='single'):
-            source = '# coding: %s\n%s' % (self.encoding,
-                                           source.encode(self.encoding))
+        def runsource(self, source, filename='<input>', symbol='single',
+                      encode=True):
+            if encode:
+                source = '# coding: %s\n%s' % (self.encoding,
+                                               source.encode(self.encoding))
             return code.InteractiveInterpreter.runsource(self, source,
                                                          filename, symbol)
 
@@ -111,10 +113,10 @@ def showtraceback(self):
             tblist = traceback.extract_tb(tb)
             del tblist[:1]
             # Set the right lineno (encoding header adds an extra line)
-            lineno = tblist[0][1]
             if not py3:
-                lineno -= 1
-            tblist[0] = (tblist[0][0], lineno) + tblist[0][2:]
+                for i, (filename, lineno, module, something) in enumerate(tblist):
+                    if filename == '<input>':
+                        tblist[i] = (filename, lineno - 1, module, something)
 
             l = traceback.format_list(tblist)
             if l:
@@ -300,13 +302,15 @@ def __init__(self, interp, config, idle=None):
         if os.path.exists(pythonhist):
             self.rl_history.load(pythonhist, getpreferredencoding())
 
-# This was a feature request to have the PYTHONSTARTUP
-# file executed on startup - I personally don't use this
-# feature so please notify me of any breakage.
+    def startup(self):
+        """
+        Execute PYTHONSTARTUP file if it exits. Call this after front
+        end-specific initialisation.
+        """
         filename = os.environ.get('PYTHONSTARTUP')
         if filename and os.path.isfile(filename):
             with open(filename, 'r') as f:
-                self.interp.runsource(f.read(), filename, 'exec')
+                self.interp.runsource(f.read(), filename, 'exec', encode=False)
 
     def attr_matches(self, text):
         """Taken from rlcompleter.py and bent to my will."""
