Try to read encoding of PYTHONSTARTUP file first, and then read it with correct encoding

sebastinas · sebastinas · commit d0bc25d21039 · 2015-02-07T18:37:59.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -24,9 +24,11 @@
 from __future__ import with_statement
 import collections
 import inspect
+import io
 import keyword
 import pydoc
 import types
+from six.moves import range
 
 from pygments.token import Token
 
@@ -280,13 +282,25 @@ def is_callable(obj):
 
 
 def get_encoding(obj):
+    """Try to obtain encoding information of the source of an object."""
     for line in inspect.findsource(obj)[0][:2]:
         m = get_encoding_re.search(line)
         if m:
             return m.group(1)
     return 'ascii'
 
 
+def get_encoding_file(fname):
+    """Try to obtain encoding information from a Python source file."""
+    with io.open(fname, 'rt', encoding='ascii', errors='ignore') as f:
+        for unused in range(2):
+            line = f.readline()
+            match = get_encoding_re.search(line)
+            if match:
+                return match.group(1)
+    return 'ascii'
+
+
 def get_source_unicode(obj):
     """Returns a decoded source of object"""
     if py3:
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -24,6 +24,7 @@
 import code
 import errno
 import inspect
+import io
 import os
 import pkgutil
 import pydoc
@@ -406,12 +407,9 @@ def startup(self):
         """
         filename = os.environ.get('PYTHONSTARTUP')
         if filename:
-            with open(filename, 'r') as f:
-                if py3:
-                    self.interp.runsource(f.read(), filename, 'exec')
-                else:
-                    self.interp.runsource(f.read(), filename, 'exec',
-                                          encode=False)
+            encoding = inspection.get_encoding_file(filename)
+            with io.open(filename, 'rt', encoding=encoding) as f:
+                self.interp.runsource(f.read(), filename, 'exec')
 
     def current_string(self, concatenate=False):
         """If the line ends in a string get it, otherwise return ''"""
