SystemExit: non integer code should be written to Python level stderr

Author: steve-s

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

@@ -152,6 +152,7 @@
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.object.ObjectBuiltins;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
+import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
 import com.oracle.graal.python.builtins.objects.posix.DirEntryBuiltins;
 import com.oracle.graal.python.builtins.objects.posix.ScandirIteratorBuiltins;
 import com.oracle.graal.python.builtins.objects.random.RandomBuiltins;
@@ -568,6 +569,21 @@ public void warn(PythonBuiltinClassType type, String format, Object... args) {
         WarningsModuleBuiltins.WarnNode.getUncached().warnFormat(null, null, type, 1, format, args);
     }
 
+    @Override
+    public Object getStderr() {
+        Object sys = lookupBuiltinModule("sys");
+        try {
+            return PythonObjectLibrary.getUncached().lookupAttribute(sys, null, "stderr");
+        } catch (PException e) {
+            try {
+                getContext().getEnv().err().write("lost sys.stderr\n".getBytes());
+            } catch (IOException ioe) {
+                // nothing more we can do
+            }
+            throw e;
+        }
+    }
+
     private void publishBuiltinModules() {
         PythonModule sysModule = builtinModules.get("sys");
         PDict sysModules = (PDict) sysModule.getAttribute("modules");

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

@@ -40,7 +40,6 @@
  */
 package com.oracle.graal.python.builtins.modules;
 
-import java.io.IOException;
 import java.util.IllegalFormatException;
 import java.util.List;
 
@@ -529,18 +528,7 @@ private static void showWarning(Object filename, int lineno, Object text, Object
             } else {
                 name = polib.lookupAttribute(category, null, SpecialAttributeNames.__NAME__);
             }
-            Object sys = PythonLanguage.getCore().lookupBuiltinModule("sys");
-            Object stderr;
-            try {
-                stderr = polib.lookupAttribute(sys, null, "stderr");
-            } catch (PException e) {
-                try {
-                    PythonLanguage.getContext().getEnv().err().write("lost sys.stderr\n".getBytes());
-                } catch (IOException ioe) {
-                    // nothing more we can do
-                }
-                throw e;
-            }
+            Object stderr = PythonLanguage.getCore().getStderr();
 
             // tfel: I've inlined PyFile_WriteObject, which just calls the "write" method and
             // decides if we should use "repr" or "str" - in this case its always "str" for objects
@@ -823,10 +811,12 @@ private static String getSourceLine(PDict globals, int lineno) {
         private final Assumption passFrame = Truffle.getRuntime().createAssumption();
         private final Assumption passExc = Truffle.getRuntime().createAssumption();
 
+        @Override
         public Assumption needNotPassFrameAssumption() {
             return passFrame;
         }
 
+        @Override
         public Assumption needNotPassExceptionAssumption() {
             return passExc;
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/TopLevelExceptionHandler.java

@@ -250,11 +250,9 @@ private void handleSystemExit(VirtualFrame frame, PBaseException pythonException
         }
         if (theContext.getOption(PythonOptions.AlwaysRunExcepthook)) {
             // If we failed to dig out the exit code we just print and leave
-            try {
-                theContext.getEnv().err().write(callStrNode.executeObject(frame, pythonException).toString().getBytes());
-                theContext.getEnv().err().write('\n');
-            } catch (IOException e1) {
-            }
+            Object stderr = theContext.getCore().getStderr();
+            Object message = callStrNode.executeObject(frame, pythonException);
+            PythonObjectLibrary.getUncached().lookupAndCallRegularMethod(stderr, null, "write", message);
             throw new PythonExitException(this, 1);
         }
         PException e = pythonException.getExceptionForReraise(pythonException.getTraceback());

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

@@ -72,6 +72,11 @@ public interface PythonCore extends ParserErrorCallback {
     @Override
     void warn(PythonBuiltinClassType type, String format, Object... args);
 
+    /**
+     * Returns the stderr object or signals error when stderr is "lost".
+     */
+    Object getStderr();
+
     // Accessors
     @Override
     public PythonLanguage getLanguage();