clean up curtsies.repl.Repl and implement weak rewind

thomasballinger · thomasballinger · commit b41d20a31f40 · 2014-02-28T19:39:24.000-05:00
weak rewind is cli.py-style rewind, where a new interpreter
isn't used. This is useful when bpython REPL was initialized
with locals, or was run as -i.
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
 import sys
-import os
+import code
 from optparse import Option
 
 import curtsies
@@ -28,14 +28,37 @@ def main(args=None, locals_=None, banner=None):
         import logging
         logging.basicConfig(filename='scroll.log', level=logging.DEBUG)
 
-    # do parsing before doing any frontend stuff
+    interp = None
+    paste = None
+    if exec_args:
+        assert options, "don't pass in exec_args without options"
+        exit_value = 0
+        if options.type:
+            paste = curtsies.events.PasteEvent()
+            sourcecode = open(exec_args[0]).read()
+            paste.events.extend(sourcecode)
+        else:
+            try:
+                interp = code.InteractiveInterpreter(locals=locals_)
+                bpargs.exec_code(interp, exec_args)
+            except SystemExit, e:
+                exit_value = e.args
+            if not options.interactive:
+                raise SystemExit(exit_value)
+    else:
+        sys.path.insert(0, '') # expected for interactive sessions (python does it)
+
+    mainloop(config, locals_, banner, interp, paste)
+
+def mainloop(config, locals_, banner, interp=None, paste=None):
     with Terminal(paste_mode=True) as tc:
         with Window(tc, keep_last_line=True, hide_cursor=False) as term:
             #TODO why need to make repl first
             with Repl(config=config,
                       locals_=locals_,
                       stuff_a_refresh_request=tc.stuff_a_refresh_request,
-                      banner=banner) as repl:
+                      banner=banner,
+                      interp=interp) as repl:
                 rows, columns = tc.get_screen_size()
                 repl.width = columns
                 repl.height = rows
@@ -58,34 +81,12 @@ def process_event(e):
                         # Could this be calculated in the repl, avoiding this
                         # two-way communication?
 
-                exit_value = 0
-                if exec_args:
-                    assert options, "don't pass in exec_args without options"
-                    if options.type:
-                        repl.process_event(tc.get_event()) #first event will always be a window size set
-                        paste = curtsies.events.PasteEvent()
-                        old_argv, sys.argv = sys.argv, exec_args
-                        paste.events.extend(open(exec_args[0]).read())
-                        sys.path.insert(0, os.path.abspath(os.path.dirname(exec_args[0])))
-                        process_event(paste)
-                    else:
-                        try:
-                            # THIS IS NORMAL PYTHON
-                            #TODO replace this so that stdout is properly harvested for display and rewind works
-                            bpargs.exec_code(repl.interp, exec_args)
-                        except SystemExit, e:
-                            exit_value = e.args
-                        if not options.interactive:
-                            #TODO treat this properly: no prompt should ever display, but stdout should!
-                            array, cursor_pos = repl.paint(about_to_exit=True)
-                            term.render_to_terminal(array, cursor_pos)
-                            raise SystemExit(exit_value)
-                else:
-                    sys.path.insert(0, '') # expected for interactive sessions (python does it)
+                if paste:
+                    repl.process_event(tc.get_event()) #first event will always be a window size set
+                    process_event(paste)
 
                 while True:
                     process_event(tc.get_event())
 
-
 if __name__ == '__main__':
     sys.exit(main())
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -125,14 +125,18 @@ class Repl(BpythonRepl):
     """
 
     ## initialization, cleanup
-    def __init__(self, locals_=None, config=None, stuff_a_refresh_request=lambda: None, banner=None):
+    def __init__(self, locals_=None, config=None, stuff_a_refresh_request=lambda: None, banner=None, interp=None):
         logging.debug("starting init")
 
         if config is None:
             config = Struct()
             loadini(config, default_config_path())
 
-        interp = code.InteractiveInterpreter(locals=locals_)
+        self.weak_rewind = bool(locals_ or interp)
+
+        if interp is None:
+            interp = code.InteractiveInterpreter(locals=locals_)
+
 
         if banner is None:
             banner = _('welcome to bpython')
@@ -822,10 +826,13 @@ def reevaluate(self, insert_into_history=False):
         self.display_lines = []
 
         self.done = True # this keeps the first prompt correct
-        self.interp = code.InteractiveInterpreter()
-        self.coderunner.interp = self.interp
-        self.completer = Autocomplete(self.interp.locals, self.config)
-        self.completer.autocomplete_mode = 'simple'
+
+        if not self.weak_rewind:
+            self.interp = code.InteractiveInterpreter()
+            self.coderunner.interp = self.interp
+            self.completer = Autocomplete(self.interp.locals, self.config)
+            self.completer.autocomplete_mode = 'simple'
+
         self.buffer = []
         self.display_buffer = []
         self.highlighted_paren = None
