Drop importlib changes

Signed-off-by: Filipe Laíns <lains@riseup.net>

Author: FFY00

Lib/importlib/_bootstrap_external.py

@@ -1311,7 +1311,6 @@ def find_spec(cls, fullname, path=None, target=None):
                 # can create the namespace package.
                 spec.origin = None
                 spec.submodule_search_locations = _NamespacePath(fullname, namespace_path, cls._get_spec)
-                spec.loader = NamespaceLoader(fullname, namespace_path, cls._get_spec)
                 return spec
             else:
                 return None

Lib/modulefinder.py

@@ -66,7 +66,12 @@ def _find_module(name, path=None):
 
     file_path = spec.origin
 
-    if isinstance(spec.loader, importlib.machinery.NamespaceLoader):
+    # On namespace packages, spec.loader might be None, but
+    # spec.submodule_search_locations should always be set — check it instead.
+    #
+    # TODO: Update the type check once GH-119669 is merged.
+    # if isinstance(spec.submodule_search_locations, importlib.machinery.NamespacePath):
+    if 'NamespacePath' in type(spec.submodule_search_locations).__name__:
         return None, spec.submodule_search_locations, ("", "", _PKG_DIRECTORY)
 
     if spec.loader.is_package(name):  # non-namespace package