fix display of non-ascii characters

thomasballinger · thomasballinger · commit 863d7e4beffb · 2013-10-13T23:20:05.000-04:00
--HG--
branch : scroll-frontend
diff --git a/bpython/scrollfrontend/repl.py b/bpython/scrollfrontend/repl.py
@@ -42,9 +42,28 @@
 #TODO options.interactive, .quiet
 #TODO execute file if in args
 #TODO working raw_input
+#TODO use events instead of length-one queues for interthread communication
 
 from bpython.keys import cli_key_dispatch as key_dispatch
 
+#TODO not that this object is custom, it should do more (not treated like a StringIO)
+class FakeStdout(object):
+    def __init__(self):
+        self.data = StringIO()
+    def seek(self, pos, mode=0): return self.data.seek(pos, mode)
+    def tell(self): return self.data.tell()
+    def read(self, n=None):
+        data = self.data.read()
+        if isinstance(data, bytes):
+            return data.decode('utf8')
+        else:
+            return data
+    def write(self, msg):
+        if isinstance(msg, bytes):
+            return self.data.write(msg.encode('uft8'))
+        else:
+            return self.data.write(msg)
+
 class FakeStdin(object):
     def __init__(self, on_receive_tuple):
         self.request_from_executing_code = Queue.Queue(maxsize=1)
@@ -162,7 +181,7 @@ def __enter__(self):
         self.orig_stdout = sys.stdout
         self.orig_stderr = sys.stderr
         self.orig_stdin = sys.stdin
-        sys.stdout = StringIO()
+        sys.stdout = FakeStdout()
         sys.stderr = StringIO()
         sys.stdin = self.stdin
         return self
