Merge remote-tracking branch 'caleb/add-fileno-to-fakeoutput'

thomasballinger · thomasballinger · commit b30efb86ff4c · 2016-06-05T22:15:21.000-04:00
diff --git a/bpython/curtsiesfrontend/coderunner.py b/bpython/curtsiesfrontend/coderunner.py
@@ -195,20 +195,30 @@ def request_from_main_greenlet(self, force_refresh=False):
 
 
 class FakeOutput(object):
-    def __init__(self, coderunner, on_write):
+    def __init__(self, coderunner, on_write, fileno=1):
         """Fakes sys.stdout or sys.stderr
 
         on_write should always take unicode
+
+        fileno should be the fileno that on_write will
+                output to (e.g. 1 for standard output).
         """
         self.coderunner = coderunner
         self.on_write = on_write
+        self.real_fileno = fileno
 
     def write(self, s, *args, **kwargs):
         if not py3 and isinstance(s, str):
             s = s.decode(getpreferredencoding(), 'ignore')
         self.on_write(s, *args, **kwargs)
         return self.coderunner.request_from_main_greenlet(force_refresh=True)
 
+    # Some applications which use curses require that sys.stdout
+    # 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
+
     def writelines(self, l):
         for s in l:
             self.write(s)
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -389,8 +389,13 @@ def __init__(self,
         self.orig_tcattrs = orig_tcattrs
 
         self.coderunner = CodeRunner(self.interp, self.request_refresh)
-        self.stdout = FakeOutput(self.coderunner, self.send_to_stdout)
-        self.stderr = FakeOutput(self.coderunner, self.send_to_stderr)
+
+        # 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())
+        self.stderr = FakeOutput(self.coderunner, self.send_to_stderr,
+                                 fileno=sys.__stderr__.fileno())
         self.stdin = FakeStdin(self.coderunner, self, self.edit_keys)
 
         # next paint should clear screen
