[GR-31315] Add cwd to path after importing site

PullRequest: graalpython/1801

Author: msimacek

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -143,9 +143,10 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
                     inspectFlag = true;
                     break;
                 case "-m":
-                    if (i + 1 < arguments.size()) {
-                        // don't increment i here so that we capture the correct args
-                        String module = arguments.get(i + 1);
+                    programArgs.add(arg);
+                    i++;
+                    if (i < arguments.size()) {
+                        String module = arguments.get(i);
                         commandString = "import runpy; runpy._run_module_as_main('" + module + "')";
                     } else {
                         print("Argument expected for the -m option");

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SysModuleBuiltins.java

@@ -99,7 +99,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Truffle;
-import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
@@ -401,15 +400,11 @@ public void postInitialize(PythonCore core) {
         Env env = context.getEnv();
         String option = context.getOption(PythonOptions.PythonPath);
 
-        boolean isIsolated = context.getOption(PythonOptions.IsolateFlag);
         boolean capiSeparate = !capiHome.equals(coreHome);
 
         Object[] path;
         int pathIdx = 0;
         int defaultPathsLen = 2;
-        if (!isIsolated) {
-            defaultPathsLen++;
-        }
         if (capiSeparate) {
             defaultPathsLen++;
         }
@@ -421,9 +416,6 @@ public void postInitialize(PythonCore core) {
         } else {
             path = new Object[defaultPathsLen];
         }
-        if (!isIsolated) {
-            path[pathIdx++] = getScriptPath(env, args);
-        }
         path[pathIdx++] = stdlibHome;
         path[pathIdx++] = coreHome + env.getFileNameSeparator() + "modules";
         if (capiSeparate) {
@@ -451,29 +443,6 @@ public void postInitialize(PythonCore core) {
         ));
     }
 
-    private static String getScriptPath(Env env, String[] args) {
-        String scriptPath;
-        if (args.length > 0) {
-            String argv0 = args[0];
-            if (argv0 != null && !argv0.startsWith("-") && !argv0.isEmpty()) {
-                TruffleFile scriptFile = env.getPublicTruffleFile(argv0);
-                try {
-                    scriptPath = scriptFile.getAbsoluteFile().getParent().getPath();
-                } catch (SecurityException e) {
-                    scriptPath = scriptFile.getParent().getPath();
-                }
-                if (scriptPath == null) {
-                    scriptPath = ".";
-                }
-            } else {
-                scriptPath = "";
-            }
-        } else {
-            scriptPath = "";
-        }
-        return scriptPath;
-    }
-
     @Builtin(name = "exc_info", needsFrame = true)
     @GenerateNodeFactory
     public abstract static class ExcInfoNode extends PythonBuiltinNode {

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

@@ -698,6 +698,44 @@ private void importSiteIfForced() {
             CallTarget site = env.parsePublic(IMPORT_WARNINGS_SOURCE);
             site.call();
         }
+        if (!getOption(PythonOptions.IsolateFlag)) {
+            String path0 = computeSysPath0();
+            if (path0 != null) {
+                PythonModule sys = core.lookupBuiltinModule("sys");
+                Object path = sys.getAttribute("path");
+                PythonObjectLibrary.getUncached().lookupAndCallRegularMethod(path, null, "insert", 0, path0);
+            }
+        }
+    }
+
+    // Equivalent of pathconfig.c:_PyPathConfig_ComputeSysPath0
+    private String computeSysPath0() {
+        String[] args = env.getApplicationArguments();
+        if (args.length == 0) {
+            return null;
+        }
+        String argv0 = args[0];
+        if (argv0.isEmpty()) {
+            return "";
+        } else if (argv0.equals("-m")) {
+            try {
+                return env.getCurrentWorkingDirectory().getPath();
+            } catch (SecurityException e) {
+                return null;
+            }
+        } else if (!argv0.equals("-c")) {
+            TruffleFile scriptFile = env.getPublicTruffleFile(argv0);
+            TruffleFile parent;
+            try {
+                parent = scriptFile.getCanonicalFile().getParent();
+            } catch (SecurityException | IOException e) {
+                parent = scriptFile.getParent();
+            }
+            if (parent != null) {
+                return parent.getPath();
+            }
+        }
+        return "";
     }
 
     /**