Implement find_spec in vendored module importers

Fixes pypa#2632
webknjaz · Apr 8, 2021 · 8b77c05 · 8b77c05
1 parent ee6a5ff
commit 8b77c05
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py
@@ -20,17 +20,18 @@ def search_path(self):
         yield self.vendor_pkg + '.'
         yield ''
 
+    def _module_matches_namespace(self, fullname):
+        """Figure out if the target module is vendored."""
+        root, base, target = fullname.partition(self.root_name + '.')
+        return not root and any(map(target.startswith, self.vendored_names))
+
     def find_module(self, fullname, path=None):
         """
         Return self when fullname starts with root_name and the
         target module is one vendored through this importer.
         """
-        root, base, target = fullname.partition(self.root_name + '.')
-        if root:
-            return
-        if not any(map(target.startswith, self.vendored_names)):
-            return
-        return self
+        spec = self.find_spec(fullname, path)
+        return spec.loader if spec is not None else None
 
     def load_module(self, fullname):
         """
@@ -60,6 +61,13 @@ def create_module(self, spec):
     def exec_module(self, module):
         pass
 
+    def find_spec(self, fullname, path=None, target=None):
+        """Produce a registered namespace matching module spec."""
+        return (
+            importlib.machinery.ModuleSpec(fullname, self)
+            if self._module_matches_namespace(fullname) else None
+        )
+
     def install(self):
         """
         Install this importer into sys.meta_path if not already present.

diff --git a/setuptools/extern/__init__.py b/setuptools/extern/__init__.py
@@ -20,17 +20,18 @@ def search_path(self):
         yield self.vendor_pkg + '.'
         yield ''
 
+    def _module_matches_namespace(self, fullname):
+        """Figure out if the target module is vendored."""
+        root, base, target = fullname.partition(self.root_name + '.')
+        return not root and any(map(target.startswith, self.vendored_names))
+
     def find_module(self, fullname, path=None):
         """
         Return self when fullname starts with root_name and the
         target module is one vendored through this importer.
         """
-        root, base, target = fullname.partition(self.root_name + '.')
-        if root:
-            return
-        if not any(map(target.startswith, self.vendored_names)):
-            return
-        return self
+        spec = self.find_spec(fullname, path)
+        return spec.loader if spec is not None else None
 
     def load_module(self, fullname):
         """
@@ -60,6 +61,13 @@ def create_module(self, spec):
     def exec_module(self, module):
         pass
 
+    def find_spec(self, fullname, path=None, target=None):
+        """Produce a registered namespace matching module spec."""
+        return (
+            importlib.machinery.ModuleSpec(fullname, self)
+            if self._module_matches_namespace(fullname) else None
+        )
+
     def install(self):
         """
         Install this importer into sys.meta_path if not already present.