deal with cases that locale.getpreferredencoding returns None - which apparently it does for some dude's setup; delegate to sys.getdefaultencoding

bobf · bobf · commit 5498a389cf19 · 2010-07-16T15:39:41.000+01:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -37,7 +37,8 @@
 import unicodedata
 import errno
 
-from locale import LC_ALL, getpreferredencoding, setlocale
+from locale import LC_ALL, setlocale
+import locale
 from types import ModuleType
 
 # These are used for syntax hilighting.
@@ -60,14 +61,15 @@
 from bpython.pager import page
 import bpython.args
 
-
 def log(x):
     f = open('/tmp/bpython.log', 'a')
     f.write('%s\n' % (x,))
 
 py3 = sys.version_info[0] == 3
 stdscr = None
 
+def getpreferredencoding():
+    return locale.getpreferredencoding() or sys.getdefaultencoding()
 
 def calculate_screen_lines(tokens, width, cursor=0):
     """Given a stream of tokens and a screen width plus an optional
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -60,7 +60,7 @@
 
 class Interpreter(code.InteractiveInterpreter):
 
-    def __init__(self, locals=None, encoding=sys.getdefaultencoding()):
+    def __init__(self, locals=None, encoding=None):
         """The syntaxerror callback can be set at any time and will be called
         on a caught syntax error. The purpose for this in bpython is so that
         the repl can be instantiated after the interpreter (which it
@@ -69,7 +69,7 @@ def __init__(self, locals=None, encoding=sys.getdefaultencoding()):
         specifically, this is so that autoindentation does not occur after a
         traceback."""
 
-        self.encoding = encoding
+        self.encoding = encoding or sys.getdefaultencoding()
         self.syntaxerror_callback = None
 # Unfortunately code.InteractiveInterpreter is a classic class, so no super()
         code.InteractiveInterpreter.__init__(self, locals)
