avoid having to import in the CachedImportFinder

Author: timfel

graalpython/lib-graalpython/_frozen_importlib.py

@@ -55,4 +55,5 @@ def load(suffix=""):
 sys.modules["builtins"].__import__ = __builtin__(importlib.__import__)
 
 # Insert our meta finder for caching
+_imp.CachedImportFinder.ModuleSpec = importlib.ModuleSpec
 sys.meta_path.insert(0, _imp.CachedImportFinder)

graalpython/lib-graalpython/_imp.py

@@ -135,7 +135,6 @@ def freeze_module(mod, key=None):
 class CachedImportFinder:
     @staticmethod
     def find_spec(fullname, path, target=None):
-        from _frozen_importlib import ModuleSpec
         path = _unpatch_package_paths(graal_python_get_cached_code_path(fullname))
         if path is not None:
             if len(path) > 0:
@@ -144,7 +143,7 @@ def find_spec(fullname, path, target=None):
             else:
                 submodule_search_locations = None
                 is_package = False
-            spec = ModuleSpec(fullname, CachedLoader, is_package=is_package)
+            spec = CachedImportFinder.ModuleSpec(fullname, CachedLoader, is_package=is_package)
             # we're not setting origin, so the module won't have a __file__
             # attribute and will show up as built-in
             spec.submodule_search_locations = submodule_search_locations