1 files changed, 22 insertions, 20 deletions
diff --git a/sources/shiboken2/libshiboken/embed/signature_bootstrap.py b/sources/shiboken2/libshiboken/embed/signature_bootstrap.py
index 902864267..b64131c15 100644
--- a/sources/shiboken2/libshiboken/embed/signature_bootstrap.py
+++ b/sources/shiboken2/libshiboken/embed/signature_bootstrap.py
@@ -62,6 +62,11 @@ recursion_trap = 0
 # Python 2 is not able to import when the extension import is still active.
 # Phase 1 simply defines the functions, which will be used in Phase 2.
 
+import sys
+if sys.version_info[0] >= 3:
+    from importlib.machinery import ModuleSpec
+
+
 def bootstrap():
     import sys
     import os
@@ -204,31 +209,28 @@ class EmbeddableZipImporter(object):
             return None
 
         self.zfile = zip_file
-        self._path2mod = {_.filename : p2m(_.filename) for _ in zip_file.filelist}
-        self._mod2path = {_[1] : _[0] for _ in self._path2mod.items()}
+        self._mod2path = {p2m(_.filename) : _.filename for _ in zip_file.filelist}
 
-    def find_module(self, fullname, path):
-        return self if self._mod2path.get(fullname) else None
+    def find_spec(self, fullname, path, target=None):
+        path = self._mod2path.get(fullname)
+        return ModuleSpec(fullname, self) if path else None
 
-    def load_module(self, fullname):
-        import importlib
-        import sys
+    def create_module(self, spec):
+        return None
 
-        filename = self._mod2path.get(fullname)
-        if filename not in self._path2mod:
-            raise ImportError(fullname)
-        module_spec = importlib.machinery.ModuleSpec(fullname, None)
-        new_module = importlib.util.module_from_spec(module_spec)
+    def exec_module(self, module):
+        fullname = module.__spec__.name
+        filename = self._mod2path[fullname]
         with self.zfile.open(filename, "r") as f:   # "rb" not for zipfile
-            exec(f.read(), new_module.__dict__)
-        new_module.__file__ = filename
-        new_module.__loader__ = self
+            codeob = compile(f.read(), filename, "exec")
+            exec(codeob, module.__dict__)
+        module.__file__ = filename
+        module.__loader__ = self
         if filename.endswith("/__init__.py"):
-            new_module.__path__ = []
-            new_module.__package__ = fullname
+            module.__path__ = []
+            module.__package__ = fullname
         else:
-            new_module.__package__ = fullname.rpartition('.')[0]
-        sys.modules[fullname] = new_module
-        return new_module
+            module.__package__ = fullname.rpartition('.')[0]
+        sys.modules[fullname] = module
 
 # eof