Use pkgutil.ImpLoader for the import loader

sebastinas · sebastinas · commit 0f92c18fa502 · 2015-03-07T14:09:30.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -55,6 +55,7 @@
 
 if not py3:
     import imp
+    import pkgutil
 
 
 logger = logging.getLogger(__name__)
@@ -231,24 +232,18 @@ def load_module(self, name):
 
 
 if not py3:
-    class ImpImportLoader(object):
+    # Remember that pkgutil.ImpLoader is an old style class.
+    class ImpImportLoader(pkgutil.ImpLoader):
 
-        def __init__(self, watcher, file, pathname, description):
+        def __init__(self, watcher, *args):
             self.watcher = watcher
-            self.file = file
-            self.pathname = pathname
-            self.description = description
+            pkgutil.ImpLoader.__init__(self, *args)
 
         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()
+            module = pkgutil.ImpLoader.load_module(self, name)
+            if hasattr(module, '__file__'):
+                self.watcher.track_module(module.__file__)
+            return module
 
 
 class ImportFinder(object):
@@ -268,7 +263,7 @@ def find_module(self, fullname, path=None):
             # sys.meta_path. Use imp to perform the actual importing.
             try:
                 result = imp.find_module(fullname, path)
-                return ImpImportLoader(self.watcher, *result)
+                return ImpImportLoader(self.watcher, fullname, *result)
             except ImportError:
                 return None
 
