Merge remote-tracking branch 'origin/fix-writing-bytes-in-python-2'

sebastinas · sebastinas · commit 00760f98e002 · 2015-02-19T18:39:44.000+01:00
diff --git a/bpython/curtsiesfrontend/coderunner.py b/bpython/curtsiesfrontend/coderunner.py
@@ -15,6 +15,9 @@
 import greenlet
 import logging
 
+from bpython._py3compat import py3, try_decode
+from bpython.config import getpreferredencoding
+
 logger = logging.getLogger(__name__)
 
 
@@ -193,11 +196,17 @@ def request_from_main_greenlet(self, force_refresh=False):
 
 class FakeOutput(object):
     def __init__(self, coderunner, on_write):
+        """Fakes sys.stdout or sys.stderr
+
+        on_write should always take unicode
+        """
         self.coderunner = coderunner
         self.on_write = on_write
 
-    def write(self, *args, **kwargs):
-        self.on_write(*args, **kwargs)
+    def write(self, s, *args, **kwargs):
+        if not py3 and isinstance(s, str):
+            s = s.decode(getpreferredencoding())
+        self.on_write(s, *args, **kwargs)
         return self.coderunner.request_from_main_greenlet(force_refresh=True)
 
     def writelines(self, l):
diff --git a/bpython/test/test_curtsies_coderunner.py b/bpython/test/test_curtsies_coderunner.py
@@ -1,5 +1,7 @@
 import sys
 
+from bpython.test import mock
+
 try:
     import unittest2 as unittest
 except ImportError:
@@ -43,3 +45,13 @@ def ctrlc():
         sys.stderr = stderr
         c.load_code('1 + 1')
         c.run_code()
+
+
+class TestFakeOutput(unittest.TestCase):
+
+    def assert_unicode(self, s):
+        self.assertIsInstance(s, type(u''))
+
+    def test_bytes(self):
+        out = FakeOutput(mock.Mock(), self.assert_unicode)
+        out.write('native string type')
