Fixed Python 2 import handler

glitchassassin · Dec 27, 2017 · 3acb844 · 3acb844
1 parent fed20e3
commit 3acb844
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/coverage.svg b/coverage.svg
diff --git a/lackey/ImportHandler.py b/lackey/ImportHandler.py
@@ -29,7 +29,7 @@ def find_spec(self, fullname, path, target=None):
             return None # we don't know how to import this
     sys.meta_path.append(SikuliFinder())
 elif sys.version_info[0] == 2:
-    import importlib
+    import imp
 
     class SikuliFinder(object):
         def __init__(self, path):
@@ -45,8 +45,12 @@ def find_module(cls, name, path=None):
 
                 # Found what we're looking for. Add to path.
                 sys.path.append(sikuli_path)
-                return cls(sikuli_path)
+                return cls(filename)
 
-        def load_module(self, fullname):
-            return importlib.import_module(fullname, self.path)
+        def load_module(self, name):
+            if name in sys.modules:
+                return sys.modules[name]
+            with open(self.path, "r") as project:
+                mod = imp.load_module(name, project, self.path, (".py", "r", imp.PY_SOURCE))
+            return mod
     sys.meta_path.append(SikuliFinder)