Add encoding attribute to fake stdout/stderr.

thomasballinger · thomasballinger · commit 2d6bae81e5f9 · 2020-07-04T22:59:50.000-06:00
Start storing an original file object on the fake one.
diff --git a/bpython/curtsiesfrontend/coderunner.py b/bpython/curtsiesfrontend/coderunner.py
@@ -205,7 +205,7 @@ def request_from_main_context(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
@@ -215,7 +215,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):
@@ -227,7 +227,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:
@@ -238,3 +238,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
@@ -421,12 +421,12 @@ def __init__(
         self.stdout = FakeOutput(
             self.coderunner,
             self.send_to_stdouterr,
-            fileno=sys.__stdout__.fileno(),
+            real_fileobj=sys.__stdout__,
         )
         self.stderr = FakeOutput(
             self.coderunner,
             self.send_to_stdouterr,
-            fileno=sys.__stderr__.fileno(),
+            real_fileobj=sys.__stderr__,
         )
         self.stdin = FakeStdin(self.coderunner, self, self.edit_keys)
 

Original file line number	Diff line number	Diff line change
`@@ -421,12 +421,12 @@ def __init__(`
`421`	`421`	`self.stdout = FakeOutput(`
`422`	`422`	`self.coderunner,`
`423`	`423`	`self.send_to_stdouterr,`
`424`		`- fileno=sys.__stdout__.fileno(),`
	`424`	`+ real_fileobj=sys.__stdout__,`
`425`	`425`	`)`
`426`	`426`	`self.stderr = FakeOutput(`
`427`	`427`	`self.coderunner,`
`428`	`428`	`self.send_to_stdouterr,`
`429`		`- fileno=sys.__stderr__.fileno(),`
	`429`	`+ real_fileobj=sys.__stderr__,`
`430`	`430`	`)`
`431`	`431`	`self.stdin = FakeStdin(self.coderunner, self, self.edit_keys)`
`432`	`432`