Merge remote-tracking branch 'origin/master' into topic/GR-13481

Author: timfel

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

@@ -394,10 +394,15 @@ protected void launch(Builder contextBuilder) {
             unbufferedIO = unbufferedIO || System.getenv("PYTHONUNBUFFERED") != null;
         }
 
-        // The unlikely separator is used because options need to be strings. See
-        // PythonOptions.getExecutableList()
-        contextBuilder.option("python.ExecutableList", String.join("🏆", getExecutableList()));
-        setContextOptionIfUnset(contextBuilder, "python.Executable", getExecutable());
+        String executable = getContextOptionIfSetViaCommandLine("python.Executable");
+        if (executable != null) {
+            contextBuilder.option("python.ExecutableList", executable);
+        } else {
+            contextBuilder.option("python.Executable", getExecutable());
+            // The unlikely separator is used because options need to be
+            // strings. See PythonOptions.getExecutableList()
+            contextBuilder.option("python.ExecutableList", String.join("🏆", getExecutableList()));
+        }
 
         // setting this to make sure our TopLevelExceptionHandler calls the excepthook
         // to print Python exceptions
@@ -471,16 +476,21 @@ protected void launch(Builder contextBuilder) {
         System.exit(rc);
     }
 
-    private void setContextOptionIfUnset(Builder contextBuilder, String key, String value) {
+    private String getContextOptionIfSetViaCommandLine(String key) {
         if (System.getProperty("polyglot." + key) != null) {
-            return;
+            return System.getProperty("polyglot." + key);
         }
         for (String f : givenArguments) {
             if (f.startsWith("--" + key)) {
-                return;
+                String[] splits = f.split("=", 2);
+                if (splits.length > 1) {
+                    return splits[1];
+                } else {
+                    return "true";
+                }
             }
         }
-        contextBuilder.option(key, value);
+        return null;
     }
 
     private static void printFileNotFoundException(NoSuchFileException e) {

graalpython/com.oracle.graal.python.tck/src/com/oracle/graal/python/tck/PythonProvider.java

@@ -318,7 +318,13 @@ private static Source createSource(String resourceName) throws IOException {
         int slashIndex = resourceName.lastIndexOf('/');
         String scriptName = slashIndex >= 0 ? resourceName.substring(slashIndex + 1) : resourceName;
         Reader in = new InputStreamReader(PythonProvider.class.getResourceAsStream(resourceName), "UTF-8");
-        return Source.newBuilder(ID, in, scriptName).build();
+        try {
+            return Source.newBuilder(ID, in, scriptName).build();
+        } finally {
+            if (in != null) {
+                in.close();
+            }
+        }
     }
 
     private abstract static class PResultVerifier implements ResultVerifier {

graalpython/com.oracle.graal.python.test/src/tests/test_zipimport.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates.
 # Copyright (C) 1996-2017 Python Software Foundation
 #
 # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -24,9 +24,12 @@ def get_file():
 """
 
 ZIP_FILE_NAME = 'testzipfile.zip'
+EGG_FILE_NAME = 'testeggfile.egg'
 DIR_PATH = os.path.dirname(os.path.realpath(__file__))
 ZIP_PATH = os.path.join(DIR_PATH, ZIP_FILE_NAME)
 ZIP_ABS_PATH = os.path.abspath(ZIP_PATH);
+EGG_PATH = os.path.join(DIR_PATH, EGG_FILE_NAME)
+EGG_ABS_PATH = os.path.abspath(EGG_PATH);
 
 class ZipImportBaseTestCase(unittest.TestCase):
 
@@ -176,3 +179,26 @@ def test_module_import(self):
         self.assertTrue (m.get_file() == ZIP_ABS_PATH + "/MyTestModule.py")
         p = importlib.import_module("packageA.moduleC")
         self.assertTrue (p.get_file() == ZIP_ABS_PATH + "/packageA/moduleC.py")
+
+class BasicEggImportTests(ZipImportBaseTestCase):
+
+    def setUp(self):
+        ZipImportBaseTestCase.setUp(self)
+        self.z = zipimport.zipimporter(EGG_PATH)
+
+    def test_zipimporter_egg(self):
+        self.assertTrue(self.z.prefix == "")
+        self.assertTrue(self.z.archive == EGG_ABS_PATH)
+        self.assertTrue(type(self.z._files) is dict)
+        self.assertTrue(self.z._files["data.bin"] is not None)
+        self.assertTrue(self.z._files["read.me"] is not None)
+        
+    def test_egg_get_data(self):
+        data = self.z.get_data("data.bin")
+        self.assertTrue(type(data) is bytes)
+        self.assertEqual(bytes(b'ahojPK\003\004ahoj'), data)
+    
+    def test_egg_get_readme(self):
+        data = self.z.get_data("read.me")
+        self.assertTrue(type(data) is bytes)
+        self.assertEqual(bytes(b'Pokus\n'), data)

graalpython/com.oracle.graal.python.test/src/tests/testeggfile.egg

@@ -218,7 +218,8 @@ private void ensureHomeInOptions(Env env) {
                             "\n\tSysPrefix: {1}" +
                             "\n\tSysBasePrefix: {2}" +
                             "\n\tCoreHome: {3}" +
-                            "\n\tStdLibHome: {4}", home.getPath(), sysPrefix, basePrefix, coreHome, stdLibHome)));
+                            "\n\tStdLibHome: {4}" +
+                            "\n\tExecutable: {5}", home.getPath(), sysPrefix, basePrefix, coreHome, stdLibHome, env.getOptions().get(PythonOptions.Executable))));
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -600,9 +600,9 @@ private void addBuiltinsTo(PythonObject obj, PythonBuiltins builtinsForObj) {
 
     @TruffleBoundary
     private Source getSource(String basename, String prefix) {
-        String suffix = FILE_SEPARATOR + basename + ".py";
         PythonContext ctxt = getContext();
         Env env = ctxt.getEnv();
+        String suffix = env.getFileNameSeparator() + basename + ".py";
         TruffleFile file = env.getTruffleFile(prefix + suffix);
         try {
             if (file.exists()) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -1904,7 +1904,7 @@ private Object typeMetaclass(String name, PTuple bases, PDict namespace, PythonA
             boolean addDict = false;
             if (slots == null) {
                 // takes care of checking if we may_add_dict and adds it if needed
-                addDict = addDictIfNative(pythonClass);
+                addDictIfNative(pythonClass);
                 // TODO: tfel - also deal with weaklistoffset
             } else {
                 // have slots

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

@@ -227,7 +227,7 @@ private void ensureCapiWasLoaded() {
             if (!ctxt.capiWasLoaded()) {
                 Env env = ctxt.getEnv();
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                TruffleFile capiFile = env.getTruffleFile(PythonCore.getCoreHome(env) + PythonCore.FILE_SEPARATOR + "capi.bc");
+                TruffleFile capiFile = env.getTruffleFile(PythonCore.getCoreHome(env) + env.getFileNameSeparator() + "capi.bc");
                 Object capi = null;
                 try {
                     SourceBuilder capiSrcBuilder = Source.newBuilder(LLVM_LANGUAGE, capiFile);

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

@@ -73,6 +73,7 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
@@ -1343,6 +1344,7 @@ int system(String cmd) {
             if (!context.isExecutableAccessAllowed()) {
                 return -1;
             }
+            PythonLanguage.getLogger().fine(() -> "os.system: " + cmd);
             String[] command = new String[]{shell[0], shell[1], cmd};
             Env env = context.getEnv();
             try {

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

@@ -51,8 +51,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.graalvm.nativeimage.ImageInfo;
-
+import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
@@ -77,6 +76,8 @@
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 
+import org.graalvm.nativeimage.ImageInfo;
+
 @CoreFunctions(defineModule = "_posixsubprocess")
 public class PosixSubprocessModuleBuiltins extends PythonBuiltins {
     @Override
@@ -129,6 +130,7 @@ synchronized int forkExec(PList args, @SuppressWarnings("unused") PList execList
                 }
             }
 
+            PythonLanguage.getLogger().fine(() -> "_posixsubprocess.fork_exec: " + String.join(" ", argStrings));
             ProcessBuilder pb = new ProcessBuilder(argStrings);
             if (p2cread != -1 && p2cwrite != -1) {
                 pb.redirectInput(Redirect.PIPE);