Add encoding attribute to fake stdout/stderr.

thomasballinger · thomasballinger · commit 8b3f9f7e1870 · 2016-08-05T19:33:01.000-04:00
Start storing an original file object on the fake one.
diff --git a/bpython/curtsiesfrontend/coderunner.py b/bpython/curtsiesfrontend/coderunner.py
@@ -195,7 +195,7 @@ def request_from_main_greenlet(self, force_refresh=False):
 
 
 class FakeOutput(object):
-    def __init__(self, coderunner, on_write, fileno=1):
+    def __init__(self, coderunner, on_write, real_fileobj):
         """Fakes sys.stdout or sys.stderr
 
         on_write should always take unicode
@@ -205,7 +205,7 @@ def __init__(self, coderunner, on_write, fileno=1):
         """
         self.coderunner = coderunner
         self.on_write = on_write
-        self.real_fileno = fileno
+        self._real_fileobj = real_fileobj
 
     def write(self, s, *args, **kwargs):
         if not py3 and isinstance(s, str):
@@ -217,7 +217,7 @@ def write(self, s, *args, **kwargs):
     # have a method called fileno. One example is pwntools. This
     # is not a widespread issue, but is annoying.
     def fileno(self):
-        return self.real_fileno
+        return self._real_fileobj.fileno()
 
     def writelines(self, l):
         for s in l:
@@ -228,3 +228,7 @@ def flush(self):
 
     def isatty(self):
         return True
+
+    @property
+    def encoding(self):
+        return self._real_fileobj.encoding
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -393,9 +393,9 @@ def __init__(self,
         # filenos match the backing device for libs that expect it,
         # but writing to them will do weird things to the display
         self.stdout = FakeOutput(self.coderunner, self.send_to_stdout,
-                                 fileno=sys.__stdout__.fileno())
+                                 real_fileobj=sys.__stdout__)
         self.stderr = FakeOutput(self.coderunner, self.send_to_stderr,
-                                 fileno=sys.__stderr__.fileno())
+                                 real_fileobj=sys.__stderr__)
         self.stdin = FakeStdin(self.coderunner, self, self.edit_keys)
 
         # next paint should clear screen
