Skip to content

Commit d1e21d1

Browse files
committed
[GR-57991] VirtualFileSystem should not try to extract real FS paths.
PullRequest: graalpython/3510
2 parents bf3562e + 6466aa7 commit d1e21d1

File tree

7 files changed

+660
-96
lines changed

7 files changed

+660
-96
lines changed

graalpython/com.oracle.graal.python.test.integration/src/org.graalvm.python.vfs/dir1/extractme

Whitespace-only changes.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
text1
2+
text2

graalpython/com.oracle.graal.python.test.integration/src/org.graalvm.python.vfs/fileslist.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/org.graalvm.python.vfs/
22
/org.graalvm.python.vfs/dir1/
3-
/org.graalvm.python.vfs/dir1/dir2/
3+
/org.graalvm.python.vfs/dir1/extractme
44
/org.graalvm.python.vfs/dir1/file2
55
/org.graalvm.python.vfs/emptydir/
66
/org.graalvm.python.vfs/file1
7+
/org.graalvm.python.vfs/extractme
78
/org.graalvm.python.vfs/fileslist.txt
89
/org.graalvm.python.vfs/SomeFile
910
/org.graalvm.python.vfs/site-packages/

graalpython/com.oracle.graal.python.test.integration/src/org/graalvm/python/embedding/utils/test/VirtualFileSystemTest.java

Lines changed: 396 additions & 48 deletions
Large diffs are not rendered by default.

graalpython/org.graalvm.python.embedding/src/org/graalvm/python/embedding/utils/GraalPyResources.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -345,14 +345,6 @@ private static Context.Builder createContextBuilder() {
345345
option("python.PosixModuleBackend", "java").
346346
// equivalent to the Python -B flag
347347
option("python.DontWriteBytecodeFlag", "true").
348-
// equivalent to the Python -v flag
349-
option("python.VerboseFlag", System.getenv("PYTHONVERBOSE") != null ? "true" : "false").
350-
// log level
351-
option("log.python.level", System.getenv("PYTHONVERBOSE") != null ? "FINE" : "SEVERE").
352-
// equivalent to setting the PYTHONWARNINGS environment variable
353-
option("python.WarnOptions", System.getenv("PYTHONWARNINGS") == null ? "" : System.getenv("PYTHONWARNINGS")).
354-
// print Python exceptions directly
355-
option("python.AlwaysRunExcepthook", "true").
356348
// Force to automatically import site.py module, to make Python packages
357349
// available
358350
option("python.ForceImportSite", "true").

0 commit comments

Comments
 (0)