autoimport! also fixed display bug

thomasballinger · thomasballinger · commit 3c9c4ae1be46 · 2013-11-13T11:47:31.000-05:00
TODO: paint current line is more complicated than necessary!

--HG--
branch : scroll-frontend
diff --git a/bpython/config.py b/bpython/config.py
@@ -99,6 +99,7 @@ def loadini(struct, configfile):
         'scroll': {
             'list_above' : False,
             'fill_terminal' : False,
+            'auto_import' : False,
         },
         'gtk': {
             'font': 'monospace 10',
@@ -165,6 +166,7 @@ def loadini(struct, configfile):
 
     struct.scroll_list_above = config.getboolean('scroll', 'list_above')
     struct.scroll_fill_terminal = config.getboolean('scroll', 'fill_terminal')
+    struct.scroll_auto_import = config.getboolean('scroll', 'auto_import')
 
     color_scheme_name = config.get('general', 'color_scheme')
     color_gtk_scheme_name = config.get('gtk', 'color_scheme')
diff --git a/bpython/scrollfrontend/repl.py b/bpython/scrollfrontend/repl.py
@@ -104,6 +104,29 @@ def readline(self):
         self.repl.send_to_stdout(value)
         return value
 
+
+def get_interpreter(config, locals_=None):
+    if config.scroll_auto_import:
+
+        locals_ = locals_ if locals_ is not None else {}
+
+        class AutoImporter(dict):
+            def __getitem__(self, item):
+                if item in locals_:
+                    return locals_[item]
+                else:
+                    try:
+                        return __import__(item)
+                    except ImportError:
+                        raise KeyError(item)
+            def __setitem__(self, item, value):
+                locals_[item] = value
+
+        ns = AutoImporter()
+        return code.InteractiveInterpreter(locals=ns)
+    else:
+        return code.InteractiveInterpreter(locals=locals_)
+
 class Repl(BpythonRepl):
     """
 
@@ -125,12 +148,14 @@ class Repl(BpythonRepl):
     ## initialization, cleanup
     def __init__(self, locals_=None, config=None, stuff_a_refresh_request=lambda: None, banner=None):
         logging.debug("starting init")
-        interp = code.InteractiveInterpreter(locals=locals_)
 
         if config is None:
             config = Struct()
             loadini(config, default_config_path())
 
+        if config.scroll_auto_import:
+            interp = get_interpreter(config, locals_=locals_)
+
         if banner is None:
             banner = _('welcome to bpython')
 
@@ -322,7 +347,7 @@ def on_enter(self, insert_into_history=True):
         self.rl_history.last()
         self.history.append(self._current_line)
         line = self._current_line
-        self._current_line = ''
+        #self._current_line = ''
         self.cursor_offset_in_line = 0
         self.push(line, insert_into_history=insert_into_history)
 
@@ -654,6 +679,9 @@ def paint(self, about_to_exit=False):
         if self.stdin.has_focus:
             cursor_column = len(self.current_stdouterr_line) - self.stdin.cursor_offset_in_line
             assert cursor_column >= 0, cursor_column
+        elif self.coderunner.running:
+            cursor_column = len(self.current_cursor_line) + self.cursor_offset_in_line
+            assert cursor_column >= 0, (cursor_column, len(self.current_cursor_line), len(self._current_line), self.cursor_offset_in_line)
         else:
             cursor_column = len(self.current_cursor_line) - len(self._current_line) + self.cursor_offset_in_line
             assert cursor_column >= 0, (cursor_column, len(self.current_cursor_line), len(self._current_line), self.cursor_offset_in_line)
@@ -791,7 +819,7 @@ def reevaluate(self, insert_into_history=False):
         self.display_lines = []
 
         self.done = True # this keeps the first prompt correct
-        self.interp = code.InteractiveInterpreter()
+        self.interp = get_interpreter(self.config)
         self.coderunner.interp = self.interp
         self.completer = Autocomplete(self.interp.locals, self.config)
         self.completer.autocomplete_mode = 'simple'
