substitute the __path__ attribute so they are updated per context

Author: timfel

graalpython/com.oracle.graal.python.test/src/tests/test_imports.py

@@ -134,3 +134,15 @@ def test_recursive_import_from():
     if sys.version_info.minor >= 6:
         import package.recpkg
         assert package.recpkg.context is package.recpkg.reduction.context
+
+
+def test_imp_cached_imports():
+    import _imp
+
+    finder = _imp.CachedImportFinder
+
+    spec = finder.find_spec("encodings", None)
+    assert spec.submodule_search_locations
+
+    spec = finder.find_spec("encodings.utf_8", None)
+    assert not spec.submodule_search_locations

graalpython/lib-graalpython/_imp.py

@@ -85,17 +85,6 @@ def get_frozen_object(name):
 is_frozen_package = get_frozen_object
 
 
-@__builtin__
-def freeze_module(mod, key=None):
-    """
-    Freeze a module under the optional key in the language cache so that it can
-    be shared across multiple contexts.
-    """
-    path = getattr(mod, "__path__", None)
-    name = key or mod.__name__
-    graal_python_cache_module_code(key, mod.__file__, path)
-
-
 @__builtin__
 def cache_all_file_modules():
     """
@@ -111,25 +100,43 @@ def cache_all_file_modules():
                 freeze_module(v, k)
 
 
-class CachedLoader:
+@__builtin__
+def _patch_package_paths(paths):
     import sys
+    return _sub_package_paths(paths, sys.graal_python_stdlib_home, "!stdlib!")
 
-    @staticmethod
-    def create_module(spec):
-        pass
 
-    @staticmethod
-    def exec_module(module):
-        modulename = module.__name__
-        exec(graal_python_get_cached_code(modulename), module.__dict__)
-        CachedLoader.sys.modules[modulename] = module
+@__builtin__
+def _unpatch_package_paths(paths):
+    import sys
+    return _sub_package_paths(paths, "!stdlib!", sys.graal_python_stdlib_home)
+
+
+@__builtin__
+def _sub_package_paths(paths, fro, to):
+    if paths is not None:
+        return [p.replace(fro, to) for p in paths]
+
+
+@__builtin__
+def freeze_module(mod, key=None):
+    """
+    Freeze a module under the optional key in the language cache so that it can
+    be shared across multiple contexts. If the module is a package in the
+    standard library path, it's __path__ is substituted to not leak the standard
+    library path to other contexts.
+    """
+    import sys
+    path = _patch_package_paths(getattr(mod, "__path__", None))
+    name = key or mod.__name__
+    graal_python_cache_module_code(key, mod.__file__, path)
 
 
 class CachedImportFinder:
     @staticmethod
     def find_spec(fullname, path, target=None):
         from _frozen_importlib import ModuleSpec
-        path = graal_python_get_cached_code_path(fullname)
+        path = _unpatch_package_paths(graal_python_get_cached_code_path(fullname))
         if path is not None:
             if len(path) > 0:
                 submodule_search_locations = path
@@ -138,5 +145,21 @@ def find_spec(fullname, path, target=None):
                 submodule_search_locations = None
                 is_package = False
             spec = 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
             return spec
+
+
+class CachedLoader:
+    import sys
+
+    @staticmethod
+    def create_module(spec):
+        pass
+
+    @staticmethod
+    def exec_module(module):
+        modulename = module.__name__
+        exec(graal_python_get_cached_code(modulename), module.__dict__)
+        CachedLoader.sys.modules[modulename] = module