remove autoimport functionality

thomasballinger · thomasballinger · commit 711d2938dbb9 · 2013-11-22T21:52:18.000-05:00
--HG--
branch : scroll-frontend
diff --git a/bpython/config.py b/bpython/config.py
@@ -99,7 +99,6 @@ def loadini(struct, configfile):
         'scroll': {
             'list_above' : False,
             'fill_terminal' : False,
-            'auto_import' : False,
         },
         'gtk': {
             'font': 'monospace 10',
@@ -166,7 +165,6 @@ 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
@@ -100,38 +100,6 @@ def readline(self):
         self.repl.send_to_stdout(value)
         return value
 
-def get_interpreter(config, locals_=None):
-    if config.scroll_auto_import and sys.version_info[0] == 3 and sys.version_info[1] >= 3:
-
-        default = {'__name__': '__main__',
-                   '__doc__': None,
-                   '__cached__': None,
-                   '__package__': None,}
-        locals_ = default if locals_ is None else locals_
-        autoimported = []
-
-        class AutoImporter(dict):
-            def __getitem__(self, item):
-                if dict.__contains__(self, item):
-                    return dict.__getitem__(self, item)
-                else:
-                    try:
-                        module = __import__(item)
-                        autoimported.append(item)
-                        globals()[item] = module
-                        return module
-                    except ImportError:
-                        raise KeyError(item)
-            @property
-            def autoimported(self):
-                return autoimported
-
-        ns = AutoImporter()
-        ns.update(locals_)
-        return code.InteractiveInterpreter(locals=ns)
-    else:
-        return code.InteractiveInterpreter(locals=locals_)
-
 class Repl(BpythonRepl):
     """
 
@@ -158,7 +126,7 @@ def __init__(self, locals_=None, config=None, stuff_a_refresh_request=lambda: No
             config = Struct()
             loadini(config, default_config_path())
 
-        interp = get_interpreter(config, locals_=locals_)
+        interp = code.InteractiveInterpreter(locals=locals_)
 
         if banner is None:
             banner = _('welcome to bpython')
@@ -830,7 +798,7 @@ def reevaluate(self, insert_into_history=False):
         self.display_lines = []
 
         self.done = True # this keeps the first prompt correct
-        self.interp = get_interpreter(self.config)
+        self.interp = code.InteractiveInterpreter()
         self.coderunner.interp = self.interp
         self.completer = Autocomplete(self.interp.locals, self.config)
         self.completer.autocomplete_mode = 'simple'
@@ -854,9 +822,7 @@ def reevaluate(self, insert_into_history=False):
 
     def getstdout(self):
         lines = self.lines_for_display + [self.current_line_formatted]
-        imports = (['%simport %s' % (self.ps1, name) for name in self.interp.locals.autoimported]
-                   if hasattr(self.interp.locals, 'autoimported') else [])
-        s = '\n'.join(imports + [x.s if isinstance(x, FmtStr) else x for x in lines]
+        s = '\n'.join([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):
