WIP: usability fixes

PullRequest: graalpython/3383

Author: timfel

graalpython/com.oracle.graal.python.frozen/freeze_modules.py

@@ -587,21 +587,21 @@ def write_frozen_lookup(out_file, modules):
 
 def write_frozen_module_file(file, modules):
     if os.path.exists(file):
-        with open(file, "r", encoding="utf-8") as f:
+        with open(file, "r", encoding="utf-8", newline=os.linesep) as f:
             content = f.read()
         stat_result = os.stat(file)
         atime, mtime = stat_result.st_atime, stat_result.st_mtime
     else:
         content = None
     os.makedirs(os.path.dirname(file), exist_ok=True)
-    with open(file, "w", encoding="utf-8") as out_file:
+    with open(file, "w", encoding="utf-8", newline=os.linesep) as out_file:
         out_file.write(FROZEN_MODULES_HEADER)
         out_file.write("\n\n")
         write_frozen_modules_map(out_file, modules)
         out_file.write("\n")
         write_frozen_lookup(out_file, modules)
         out_file.write("}\n")
-    with open(file, "r", encoding="utf-8") as f:
+    with open(file, "r", encoding="utf-8", newline=os.linesep) as f:
         new_content = f.read()
     if new_content == content:
         # set mtime to the old one, if we didn't change anything

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

@@ -66,6 +66,8 @@
 
 public class GraalPythonMain extends AbstractLanguageLauncher {
 
+    private static final boolean IS_WINDOWS = System.getProperty("os.name") != null && System.getProperty("os.name").toLowerCase().contains("windows");
+
     private static final String SHORT_HELP = "usage: python [option] ... [-c cmd | -m mod | file | -] [arg] ...\n" +
                     "Try `python -h' for more information.";
 
@@ -552,6 +554,25 @@ private String calculateProgramFullPath(String program, Function<Path, Boolean>
                         return resolvedProgramName.toString();
                     }
 
+                    // On windows, the program name may be without the extension
+                    if (IS_WINDOWS) {
+                        String pathExtEnvvar = getEnv("PATHEXT");
+                        if (pathExtEnvvar != null) {
+                            // default extensions are defined
+                            String resolvedStr = resolvedProgramName.toString();
+                            if (resolvedStr.length() <= 3 || resolvedStr.charAt(resolvedStr.length() - 4) != '.') {
+                                // program has no file extension
+                                String[] pathExts = pathExtEnvvar.toLowerCase().split(";");
+                                for (String pathExt : pathExts) {
+                                    resolvedProgramName = Path.of(resolvedStr + pathExt);
+                                    if (isExecutable.apply(resolvedProgramName)) {
+                                        return resolvedProgramName.toString();
+                                    }
+                                }
+                            }
+                        }
+                    }
+
                     // next start is the char after the separator because we have "path0:path1" and
                     // 'i' points to ':'
                     previous = i + 1;
@@ -768,8 +789,7 @@ protected void launch(Builder contextBuilder) {
             contextBuilder.option("python.PyCachePrefix", cachePrefix);
         }
 
-        String osName = System.getProperty("os.name");
-        if (osName != null && osName.toLowerCase().contains("windows")) {
+        if (IS_WINDOWS) {
             contextBuilder.option("python.PosixModuleBackend", "java");
         }
 

mx.graalpython/suite.py

@@ -982,6 +982,7 @@
                 "sdk:LAUNCHER_COMMON",
                 "sdk:JLINE3",
                 "sdk:MAVEN_DOWNLOADER",
+                "sdk:NATIVEIMAGE",
             ],
             "description": "GraalPython launcher",
             "maven": {