automatically add import statements to generated code

thomasballinger · thomasballinger · commit 6a0264f8d2a2 · 2013-11-13T12:03:29.000-05:00
--HG--
branch : scroll-frontend
diff --git a/bpython/scrollfrontend/repl.py b/bpython/scrollfrontend/repl.py
@@ -109,18 +109,24 @@ def get_interpreter(config, locals_=None):
     if config.scroll_auto_import:
 
         locals_ = locals_ if locals_ is not None else {}
+        autoimported = []
 
         class AutoImporter(dict):
             def __getitem__(self, item):
                 if item in locals_:
                     return locals_[item]
                 else:
                     try:
-                        return __import__(item)
+                        module = __import__(item)
+                        autoimported.append(item)
+                        return module
                     except ImportError:
                         raise KeyError(item)
             def __setitem__(self, item, value):
                 locals_[item] = value
+            @property
+            def autoimported(self):
+                return autoimported
 
         ns = AutoImporter()
         return code.InteractiveInterpreter(locals=ns)
@@ -843,8 +849,9 @@ def reevaluate(self, insert_into_history=False):
 
     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]) if lines else ''
+        s = '\n'.join(['%simport %s' % (self.ps1, name) for name in self.interp.locals.autoimported] if self.config.scroll_auto_import else [] +
+                      [x.s if isinstance(x, FmtStr) else x for x in lines]
+                     ) if lines else ''
         return s
     def send_to_external_editor(self, filename=None):
         editor = os.environ.get('VISUAL', os.environ.get('EDITOR', 'vim'))
