File importlib.patch of Package saltbundlepy-setuptools

Overview Repositories Revisions Requests Users Attributes Meta

File importlib.patch of Package saltbundlepy-setuptools (Revision 0dc7dffdd066baacc290f44f04241035)

Currently displaying revision 0dc7dffdd066baacc290f44f04241035 , Show latest

Index: setuptools-41.6.0/setuptools/_imp.py
===================================================================
--- setuptools-41.6.0.orig/setuptools/_imp.py
+++ setuptools-41.6.0/setuptools/_imp.py
@@ -19,7 +19,10 @@ PY_FROZEN = 7
 
 def find_module(module, paths=None):
     """Just like 'imp.find_module()', but with package support"""
-    spec = importlib.util.find_spec(module, paths)
+    if isinstance(paths, list):
+        spec = importlib.machinery.PathFinder.find_spec(module, paths)
+    else:
+        spec = importlib.util.find_spec(module, paths)
     if spec is None:
         raise ImportError("Can't find %s" % module)
     if not spec.has_location and hasattr(spec, 'submodule_search_locations'):
@@ -60,14 +63,20 @@ def find_module(module, paths=None):
 
 
 def get_frozen_object(module, paths=None):
-    spec = importlib.util.find_spec(module, paths)
+    if isinstance(paths, list):
+        spec = importlib.machinery.PathFinder.find_spec(module, paths)
+    else:
+        spec = importlib.util.find_spec(module, paths)
     if not spec:
         raise ImportError("Can't find %s" % module)
     return spec.loader.get_code(module)
 
 
 def get_module(module, paths, info):
-    spec = importlib.util.find_spec(module, paths)
+    if isinstance(paths, list):
+        spec = importlib.machinery.PathFinder.find_spec(module, paths)
+    else:
+        spec = importlib.util.find_spec(module, paths)
     if not spec:
         raise ImportError("Can't find %s" % module)
     return module_from_spec(spec)

Places

File importlib.patch of Package saltbundlepy-setuptools (Revision 0dc7dffdd066baacc290f44f04241035)

Places