fix reload in Python 3

thomasballinger · thomasballinger · commit f42ad9bd0cad · 2015-12-17T12:01:57.000-05:00
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -14,6 +14,7 @@
 
 from bpython.curtsiesfrontend.repl import BaseRepl
 from bpython.curtsiesfrontend.coderunner import SystemExitFromCodeGreenlet
+from bpython.curtsiesfrontend.interpreter import Interp
 from bpython import args as bpargs
 from bpython import translations
 from bpython.translations import _
@@ -174,7 +175,7 @@ def main(args=None, locals_=None, banner=None, welcome_message=None):
             paste.events.extend(sourcecode)
         else:
             try:
-                interp = code.InteractiveInterpreter(locals=locals_)
+                interp = Interp(locals=locals_)
                 bpargs.exec_code(interp, exec_args)
             except SystemExit as e:
                 exit_value = e.args
diff --git a/bpython/curtsiesfrontend/sitefix.py b/bpython/curtsiesfrontend/sitefix.py
@@ -3,6 +3,8 @@
 
 from six.moves import builtins
 
+from bpython._py3compat import py3
+
 
 def resetquit(builtins):
     """Redefine builtins 'quit' and 'exit' not so close stdin
@@ -18,25 +20,32 @@ def monkeypatch_quit():
     if 'site' in sys.modules:
         resetquit(builtins)
 
-
-orig_reload = builtins.reload
-
-
-def reload(module):
-    if module is sys:
-        orig_stdout = sys.stdout
-        orig_stderr = sys.stderr
-        orig_stdin = sys.stdin
-        orig_reload(sys)
-        sys.stdout = orig_stdout
-        sys.stderr = orig_stderr
-        sys.stdin = orig_stdin
-    else:
-        builtins.reload(sys)
-
-
-functools.update_wrapper(reload, orig_reload)
+orig_reload = None
+if py3:
+    import importlib
+    if hasattr(importlib, 'reload'):
+        orig_reload = importlib.reload
+else:
+    orig_reload = builtins.reload
+
+if orig_reload:
+    def reload(module):
+        if module is sys:
+            orig_stdout = sys.stdout
+            orig_stderr = sys.stderr
+            orig_stdin = sys.stdin
+            orig_reload(sys)
+            sys.stdout = orig_stdout
+            sys.stderr = orig_stderr
+            sys.stdin = orig_stdin
+        else:
+            builtins.reload(sys)
+
+    functools.update_wrapper(reload, orig_reload)
 
 
 def monkeypatch_reload():
-    builtins.reload = reload
+    if py3 and hasattr(importlib, 'reload'):
+        importlib.reload = reload
+    else:
+        builtins.reload = reload
