Fix ImportFinder/Loader for Python 2

sebastinas · sebastinas · commit a8cf45992e9c · 2015-02-20T04:51:32.000+01:00
The value of sys.meta_path varies with the Python version.

Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -53,6 +53,9 @@
 
 from curtsies.configfile_keynames import keymap as key_dispatch
 
+if not py3:
+    import imp
+
 
 logger = logging.getLogger(__name__)
 
@@ -220,13 +223,34 @@ def __init__(self, watcher, loader):
         self.watcher = watcher
         self.loader = loader
 
-    def load_module(self, fullname):
-        module = self.loader.load_module(fullname)
+    def load_module(self, name):
+        module = self.loader.load_module(name)
         if hasattr(module, '__file__'):
             self.watcher.track_module(module.__file__)
         return module
 
 
+if not py3:
+    class ImpImportLoader(object):
+
+        def __init__(self, watcher, file, pathname, description):
+            self.watcher = watcher
+            self.file = file
+            self.pathname = pathname
+            self.description = description
+
+        def load_module(self, name):
+            try:
+                module = imp.load_module(name, self.file, self.pathname,
+                                         self.description)
+                if hasattr(module, '__file__'):
+                    self.watcher.track_module(module.__file__)
+                return module
+            finally:
+                if self.file is not None:
+                    self.file.close()
+
+
 class ImportFinder(object):
 
     def __init__(self, watcher, old_meta_path):
@@ -239,6 +263,15 @@ def find_module(self, fullname, path=None):
             if loader is not None:
                 return ImportLoader(self.watcher, loader)
 
+        if not py3:
+            # Python 2 does not have the default finders stored in
+            # sys.meta_path. Use imp to perform the actual importing.
+            try:
+                result = imp.find_module(fullname, path)
+                return ImpImportLoader(self.watcher, *result)
+            except ImportError:
+                return None
+
         return None
 
 
