[GR-44275] Assorted minor fixes.

PullRequest: graalpython/2638

Author: timfel

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

@@ -214,7 +214,7 @@ private void handleJavaException(Throwable e) {
         try {
             boolean exitException = InteropLibrary.getUncached().isException(e) && InteropLibrary.getUncached().getExceptionType(e) == ExceptionType.EXIT;
             if (!exitException) {
-                ExceptionUtils.printPythonLikeStackTrace(e);
+                ExceptionUtils.printPythonLikeStackTrace(getContext(), e);
                 if (PythonOptions.isWithJavaStacktrace(getPythonLanguage())) {
                     e.printStackTrace();
                 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/ExceptionUtils.java

@@ -43,6 +43,7 @@
 import static com.oracle.graal.python.nodes.BuiltinNames.T_SYS;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
@@ -97,7 +98,7 @@ public static void printPythonLikeStackTrace() {
             appendStackLine(stack, location, rootNode, true, lineno);
             return null;
         });
-        printStack(stack);
+        printStack(new PrintWriter(System.err), stack);
     }
 
     private static int getLineno(Frame frame) {
@@ -114,10 +115,23 @@ private static int getLineno(Frame frame) {
     }
 
     /**
-     * this method is similar to 'PyErr_WriteUnraisable'
+     * this method is similar to 'PyErr_WriteUnraisable' and may be used when the context is not
+     * available.
      */
     @TruffleBoundary
     public static void printPythonLikeStackTrace(Throwable e) {
+        printPythonLikeStackTrace(new PrintWriter(System.err), e);
+    }
+
+    /**
+     * this method is similar to 'PyErr_WriteUnraisable'
+     */
+    @TruffleBoundary
+    public static void printPythonLikeStackTrace(PythonContext context, Throwable e) {
+        printPythonLikeStackTrace(new PrintWriter(context.getEnv().err()), e);
+    }
+
+    private static void printPythonLikeStackTrace(PrintWriter p, Throwable e) {
         List<TruffleStackTraceElement> stackTrace = TruffleStackTrace.getStackTrace(e);
         if (stackTrace != null) {
             ArrayList<String> stack = new ArrayList<>();
@@ -127,17 +141,17 @@ public static void printPythonLikeStackTrace(Throwable e) {
                 int lineno = getLineno(frame.getFrame());
                 appendStackLine(stack, location, rootNode, false, lineno);
             }
-            printStack(stack);
+            printStack(p, stack);
         }
         InteropLibrary lib = InteropLibrary.getUncached();
         if (lib.isException(e) && lib.hasExceptionMessage(lib)) {
             try {
-                System.err.println(lib.getExceptionMessage(e));
+                p.println(lib.getExceptionMessage(e));
             } catch (UnsupportedMessageException unsupportedMessageException) {
                 throw CompilerDirectives.shouldNotReachHere();
             }
         } else {
-            System.err.println(e.getMessage());
+            p.println(e.getMessage());
         }
     }
 
@@ -175,11 +189,11 @@ private static void appendStackLine(ArrayList<String> stack, Node location, Root
         }
     }
 
-    private static void printStack(final ArrayList<String> stack) {
-        System.err.println("Traceback (most recent call last):");
+    private static void printStack(PrintWriter p, final ArrayList<String> stack) {
+        p.println("Traceback (most recent call last):");
         ListIterator<String> listIterator = stack.listIterator(stack.size());
         while (listIterator.hasPrevious()) {
-            System.err.println(listIterator.previous());
+            p.println(listIterator.previous());
         }
     }
 

graalpython/lib-python/3/test/test_subprocess.py

@@ -788,7 +788,7 @@ def is_env_var_to_ignore(n):
                     n == 'LD_PRELOAD' or n.startswith('SANDBOX') or # Gentoo
                     n == 'PWD' or n == 'SHLVL' or # Graalpython bash launcher
                     n.startswith('JAVA_MAIN_CLASS') or # JVM on MacOS
-                    n == 'LD_LIBRARY_PATH' or # Added by graalpy launcher
+                    n == 'LD_LIBRARY_PATH' or n == 'DYLD_LIBRARY_PATH' or # Added by graalpy launcher
                     n == 'LC_CTYPE') # Locale coercion triggered
 
         with subprocess.Popen([sys.executable, "-c",