remove another instance of a cached path in a preinitialized context

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -258,6 +258,7 @@ public void patch(Env newEnv) {
     private void patchPackagePaths(String from, String to) {
         for (Object v : sysModules.getDictStorage().values()) {
             if (v instanceof PythonModule) {
+                // Update module.__path__
                 Object path = ((PythonModule) v).getAttribute(SpecialAttributeNames.__PATH__);
                 if (path instanceof PList) {
                     Object[] paths = ((PList) path).getSequenceStorage().getCopyOfInternalArray();
@@ -277,6 +278,18 @@ private void patchPackagePaths(String from, String to) {
                     }
                     ((PythonModule) v).setAttribute(SpecialAttributeNames.__PATH__, core.factory().createList(paths));
                 }
+
+                // Update module.__file__
+                Object file = ((PythonModule) v).getAttribute(SpecialAttributeNames.__FILE__);
+                String strFile = null;
+                if (file instanceof PString) {
+                    strFile = ((PString) file).getValue();
+                } else if (file instanceof String) {
+                    strFile = (String) file;
+                }
+                if (strFile != null) {
+                    ((PythonModule) v).setAttribute(SpecialAttributeNames.__FILE__, strFile.replace(from, to));
+                }
             }
         }
     }

mx.graalpython/mx_graalpython.py

@@ -394,9 +394,14 @@ def graalpython_gate_runner(args, tasks):
             ])
             if success not in out.data:
                 mx.abort('Output from generated SVM image "' + svm_image + '" did not match success pattern:\n' + success)
-            # Test that stdlib paths are not cached on e.g. encodings module
+            # Test that stdlib paths are not cached on packages
             out = mx.OutputCapture()
             mx.run([svm_image, "-S", "--python.StdLibHome=/foobar", "-c", "import encodings; print(encodings.__path__)"], out=mx.TeeOutputCapture(out))
+            if "/foobar" not in out.data:
+                mx.abort('Output from generated SVM image "' + svm_image + '" did not have patched std lib path "/foobar", got:\n' + success)
+            # Test that stdlib paths are not cached on modules
+            out = mx.OutputCapture()
+            mx.run([svm_image, "-S", "--python.StdLibHome=/foobar", "-c", "import encodings; print(encodings.__file__)"], out=mx.TeeOutputCapture(out))
             if "/foobar" not in out.data:
                 mx.abort('Output from generated SVM image "' + svm_image + '" did not have patched std lib path "/foobar", got:\n' + success)
             # Finally, test that we can start even if the graalvm was moved