Use importlib.util.spec_from_loader in find_spec

pypa · Apr 8, 2021 · b5f3ae5 · b5f3ae5
1 parent dd1453b
commit b5f3ae5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
@@ -1,4 +1,4 @@
-import importlib.machinery
+import importlib.util
 import sys
 
 
@@ -57,7 +57,7 @@ def exec_module(self, module):
     def find_spec(self, fullname, path=None, target=None):
         """Return a module spec for vendored names."""
         return (
-            importlib.machinery.ModuleSpec(fullname, self)
+            importlib.util.spec_from_loader(fullname, self)
             if self._module_matches_namespace(fullname) else None
         )
 

diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
@@ -1,4 +1,4 @@
-import importlib.machinery
+import importlib.util
 import sys
 
 
@@ -57,7 +57,7 @@ def exec_module(self, module):
     def find_spec(self, fullname, path=None, target=None):
         """Return a module spec for vendored names."""
         return (
-            importlib.machinery.ModuleSpec(fullname, self)
+            importlib.util.spec_from_loader(fullname, self)
             if self._module_matches_namespace(fullname) else None
         )