swap out pager when reevaluating

thomasballinger · thomasballinger · commit 96ea96050b98 · 2015-12-23T10:33:10.000-08:00
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -1,6 +1,5 @@
 from __future__ import absolute_import
 
-import code
 import collections
 import io
 import logging
@@ -104,15 +103,7 @@ def mainloop(self, interactive=True, paste=None):
         if interactive:
             # Add custom help command
             # TODO: add methods to run the code
-            self.coderunner.interp.locals['_repl'] = self
-
-            self.coderunner.interp.runsource(
-                'from bpython.curtsiesfrontend._internal '
-                'import _Helper')
-            self.coderunner.interp.runsource('help = _Helper(_repl)\n')
-
-            del self.coderunner.interp.locals['_repl']
-            del self.coderunner.interp.locals['_Helper']
+            self.initialize_interp()
 
             # run startup file
             self.process_event(bpythonevents.RunStartupFileEvent())
diff --git a/bpython/curtsiesfrontend/_internal.py b/bpython/curtsiesfrontend/_internal.py
@@ -25,6 +25,18 @@
 import bpython._internal
 
 
+class NopPydocPager(object):
+    def __enter__(self):
+        self._orig_pager = pydoc.pager
+        pydoc.pager = self
+
+    def __exit__(self, *args):
+        pydoc.pager = self._orig_pager
+
+    def __call__(self, text):
+        return None
+
+
 class _Helper(bpython._internal._Helper):
 
     def __init__(self, repl=None):
@@ -36,4 +48,11 @@ def __init__(self, repl=None):
     def pager(self, output):
         self._repl.pager(output)
 
+    def __call__(self, *args, **kwargs):
+        if self._repl.reevaluating:
+            with NopPydocPager():
+                return super(_Helper, self).__call__(*args, **kwargs)
+        else:
+            return super(_Helper, self).__call__(*args, **kwargs)
+
 # vim: sw=4 ts=4 sts=4 ai et
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -1573,6 +1573,7 @@ def reevaluate(self, insert_into_history=False):
             self.interp = self.interp.__class__()
             self.interp.write = self.send_to_stderr
             self.coderunner.interp = self.interp
+            self.initialize_interp()
 
         self.buffer = []
         self.display_buffer = []
@@ -1610,6 +1611,16 @@ def reevaluate(self, insert_into_history=False):
         self._cursor_offset = 0
         self.current_line = ''
 
+    def initialize_interp(self):
+        self.coderunner.interp.locals['_repl'] = self
+        self.coderunner.interp.runsource(
+            'from bpython.curtsiesfrontend._internal '
+            'import _Helper')
+        self.coderunner.interp.runsource('help = _Helper(_repl)\n')
+
+        del self.coderunner.interp.locals['_repl']
+        del self.coderunner.interp.locals['_Helper']
+
     def getstdout(self):
         lines = self.lines_for_display + [self.current_line_formatted]
         s = '\n'.join(x.s if isinstance(x, FmtStr) else x for x in lines) \
