branch for fixing encoding problem with PYTHONSTARTUP file - encoding is fixed but off-by-one error in tracebacks needs fixing before merging back to tip

bobf · bobf · commit 54f5835ce2bc · 2009-12-29T15:47:25.000Z
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -66,9 +66,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)
 
@@ -305,7 +307,7 @@ def __init__(self, interp, config, idle=None):
         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."""
