Consolidate common locals setup (fixes bpython#665)

sebastinas · sebastinas · commit f189da178921 · 2017-01-08T22:00:38.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -58,7 +58,6 @@
 import unicodedata
 import errno
 
-from types import ModuleType
 from six.moves import range
 
 # These are used for syntax highlighting
@@ -1891,9 +1890,6 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
     curses.raw(True)
     main_win, statusbar = init_wins(scr, config)
 
-    if locals_ is None:
-        sys.modules['__main__'] = ModuleType('__main__')
-        locals_ = sys.modules['__main__'].__dict__
     interpreter = repl.Interpreter(locals_, getpreferredencoding())
 
     clirepl = CLIRepl(main_win, interpreter, statusbar, config, idle)
diff --git a/bpython/curtsiesfrontend/interpreter.py b/bpython/curtsiesfrontend/interpreter.py
@@ -64,11 +64,6 @@ class Interp(ReplInterpreter):
     def __init__(self, locals=None, encoding=None):
         """Constructor.
 
-        The optional 'locals' argument specifies the dictionary in
-        which code will be executed; it defaults to a newly created
-        dictionary with key "__name__" set to "__console__" and key
-        "__doc__" set to None.
-
         We include an argument for the outfile to pass to the formatter for it
         to write to.
         """
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -39,6 +39,7 @@
 import traceback
 from itertools import takewhile
 from six import itervalues
+from types import ModuleType
 
 from pygments.token import Token
 
@@ -77,9 +78,16 @@ def estimate(self):
 
 
 class Interpreter(code.InteractiveInterpreter):
+    """Source code interpreter for use in bpython."""
 
     def __init__(self, locals=None, encoding=None):
-        """The syntaxerror callback can be set at any time and will be called
+        """Constructor.
+
+        The optional 'locals' argument specifies the dictionary in which code
+        will be executed; it defaults to a newly created dictionary with key
+        "__name__" set to "__main__".
+
+        The syntaxerror callback can be set at any time and will be called
         on a caught syntax error. The purpose for this in bpython is so that
         the repl can be instantiated after the interpreter (which it
         necessarily must be with the current factoring) and then an exception
@@ -95,6 +103,13 @@ def __init__(self, locals=None, encoding=None):
 
         self.encoding = encoding or sys.getdefaultencoding()
         self.syntaxerror_callback = None
+
+        if locals is None:
+            # instead of messing with sys.modules, we should modify sys.modules
+            # in the interpreter instance
+            sys.modules['__main__'] = main_mod = ModuleType('__main__')
+            locals = main_mod.__dict__
+
         # Unfortunately code.InteractiveInterpreter is a classic class, so no
         # super()
         code.InteractiveInterpreter.__init__(self, locals)
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -40,7 +40,6 @@
 import time
 import locale
 import signal
-from types import ModuleType
 from optparse import Option
 from six.moves import range
 from six import iteritems, string_types
@@ -1192,11 +1191,7 @@ def main(args=None, locals_=None, banner=None):
         event_loop = None
     # TODO: there is also a glib event loop. Do we want that one?
 
-    # __main__ construction from bpython.cli
-    if locals_ is None:
-        main_mod = sys.modules['__main__'] = ModuleType('__main__')
-        locals_ = main_mod.__dict__
-
+    extend_locals = {}
     if options.plugin:
         try:
             from twisted import plugin
@@ -1215,10 +1210,12 @@ def main(args=None, locals_=None, banner=None):
         plugopts = plug.options()
         plugopts.parseOptions(exec_args)
         serv = plug.makeService(plugopts)
-        locals_['service'] = serv
+        extend_locals['service'] = serv
         reactor.callWhenRunning(serv.startService)
         exec_args = []
     interpreter = repl.Interpreter(locals_, locale.getpreferredencoding())
+    # TODO: replace with something less hack-ish
+    interpreter.locals.update(extend_locals)
 
     # This nabs sys.stdin/out via urwid.MainLoop
     myrepl = URWIDRepl(event_loop, palette, interpreter, config)
