[GR-23687] Use org.graalvm.launcher.executablename as executable if available.

PullRequest: graalpython/982

Author: steve-s

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

@@ -66,6 +66,9 @@ public static void main(String[] args) {
     private static final String LANGUAGE_ID = "python";
     private static final String MIME_TYPE = "text/x-python";
 
+    // provided by GraalVM bash launchers, ignored in native image mode
+    private static final String BASH_LAUNCHER_EXEC_NAME = System.getProperty("org.graalvm.launcher.executablename");
+
     private ArrayList<String> programArgs = null;
     private String commandString = null;
     private String inputFile = null;
@@ -287,6 +290,17 @@ private void addRelaunchArg(String arg) {
         relaunchArgs.add(arg);
     }
 
+    private String[] execListWithRelaunchArgs(String executableName) {
+        if (relaunchArgs == null) {
+            return new String[]{executableName};
+        } else {
+            ArrayList<String> execList = new ArrayList<>(relaunchArgs.size() + 1);
+            execList.add(executableName);
+            execList.addAll(relaunchArgs);
+            return execList.toArray(new String[execList.size()]);
+        }
+    }
+
     private static void printShortHelp() {
         print("usage: python [option] ... [-c cmd | -m mod | file | -] [arg] ...\n" +
                         "Try `python -h' for more information.");
@@ -298,13 +312,11 @@ private static void print(String string) {
 
     private String[] getExecutableList() {
         if (ImageInfo.inImageCode()) {
-            ArrayList<String> exec_list = new ArrayList<>();
-            exec_list.add(ProcessProperties.getExecutableName());
-            if (relaunchArgs != null) {
-                exec_list.addAll(relaunchArgs);
-            }
-            return exec_list.toArray(new String[exec_list.size()]);
+            return execListWithRelaunchArgs(ProcessProperties.getExecutableName());
         } else {
+            if (BASH_LAUNCHER_EXEC_NAME != null) {
+                return execListWithRelaunchArgs(BASH_LAUNCHER_EXEC_NAME);
+            }
             StringBuilder sb = new StringBuilder();
             ArrayList<String> exec_list = new ArrayList<>();
             sb.append(System.getProperty("java.home")).append(File.separator).append("bin").append(File.separator).append("java");
@@ -338,6 +350,9 @@ private String getExecutable() {
         if (ImageInfo.inImageBuildtimeCode()) {
             return "";
         } else {
+            if (BASH_LAUNCHER_EXEC_NAME != null) {
+                return BASH_LAUNCHER_EXEC_NAME;
+            }
             String[] executableList = getExecutableList();
             for (int i = 0; i < executableList.length; i++) {
                 if (executableList[i].matches("\\s")) {

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

@@ -48,6 +48,8 @@
 import java.util.List;
 import java.util.Locale;
 
+import org.graalvm.collections.EconomicMap;
+
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltins;
@@ -62,8 +64,6 @@
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 
-import org.graalvm.collections.EconomicMap;
-
 @CoreFunctions(defineModule = "_locale")
 public class LocaleModuleBuiltins extends PythonBuiltins {
     static final int LC_ALL = 6;
@@ -81,6 +81,10 @@ public static Locale fromPosix(String posixLocaleId) {
         if (posixLocaleId == null) {
             return null;
         }
+        if (posixLocaleId.isEmpty()) {
+            // per Python docs: empty string -> default locale
+            return Locale.getDefault();
+        }
 
         String language;
         String country = "";