Validate that the argument of excepthook is exception

Author: steve-s

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys.txt

@@ -23,6 +23,7 @@
 *graalpython.lib-python.3.test.test_sys.SysModuleTest.test_ioencoding_nonascii
 *graalpython.lib-python.3.test.test_sys.SysModuleTest.test_no_duplicates_in_meta_path
 *graalpython.lib-python.3.test.test_sys.SysModuleTest.test_refcount
+*graalpython.lib-python.3.test.test_sys.SysModuleTest.test_executable
 *graalpython.lib-python.3.test.test_sys.SysModuleTest.test_setrecursionlimit_recursion_depth
 *graalpython.lib-python.3.test.test_sys.SysModuleTest.test_sys_getwindowsversion_no_instantiation
 *graalpython.lib-python.3.test.test_sys.UnraisableHookTest.test_custom_unraisablehook

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

@@ -148,16 +148,6 @@ private synchronized int forkExec(PList args, PList execList, @SuppressWarnings(
                 }
             }
 
-            if (!argStrings.isEmpty()) {
-                if (argStrings.get(0).equals(context.getOption(PythonOptions.Executable))) {
-                    String[] executableList = PythonOptions.getExecutableList(context);
-                    argStrings.remove(0);
-                    for (int i = executableList.length - 1; i >= 0; i--) {
-                        argStrings.add(0, executableList[i]);
-                    }
-                }
-            }
-
             File cwdFile;
             try {
                 if (getContext().getEnv().getPublicTruffleFile(cwd).exists()) {
@@ -211,14 +201,30 @@ private synchronized int forkExec(PList args, PList execList, @SuppressWarnings(
                 }
                 byte[] bytes = checkNullBytes(toBytes.execute(null, item));
                 String path = new String(bytes, StandardCharsets.US_ASCII);
-                argStrings.set(0, path);
+                int executableListLen = 0;
+                if (path.equals(context.getOption(PythonOptions.Executable))) {
+                    // In case someone passed to us sys.executable that happens to be java command
+                    // invocation with additional options like classpath, we split it to the
+                    // individual arguments
+                    String[] executableList = PythonOptions.getExecutableList(context);
+                    argStrings.remove(0);
+                    executableListLen = executableList.length;
+                    for (int j = executableListLen - 1; j >= 0; j--) {
+                        argStrings.add(0, executableList[j]);
+                    }
+                } else {
+                    argStrings.set(0, path);
+                }
                 try {
                     return exec(argStrings, cwdFile, envMap, p2cwrite, p2cread, c2pwrite, c2pread, errwrite, errpipe_write, resources, errread);
                 } catch (IOException ex) {
                     if (firstError == null) {
                         firstError = ex;
                     }
                 }
+                for (int j = 0; j < executableListLen - 1; j++) {
+                    argStrings.remove(j + 1);
+                }
             }
             assert firstError != null;
             if (errpipe_write != -1) {

graalpython/lib-graalpython/sys.py

@@ -36,6 +36,8 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
+from builtins import BaseException
+
 
 def make_implementation_info():
     from _descriptor import SimpleNamespace, make_named_tuple_class
@@ -190,6 +192,10 @@ def simple_print_traceback(e):
             print(type(e).__qualname__, file=stderr)
 
     def __print_traceback__(typ, value, tb):
+        if not isinstance(value, BaseException):
+            msg = "TypeError: print_exception(): Exception expected for value, {} found\n".format(type(value).__name__)
+            print(msg, file=stderr, end="")
+            return
         try:
             import traceback
             lines = traceback.format_exception(typ, value, tb)