[GR-13658] Introduce format specifier for exception messages.

fangerer · fangerer · commit e2bb9aa46049 · 2019-04-01T00:17:12.000-07:00
PullRequest: graalpython/458
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java
@@ -179,7 +179,7 @@ private Object loadDynamicModuleWithSpec(String name, String path, InteropLibrar
                 CallTarget callTarget = env.parse(Source.newBuilder(LLVM_LANGUAGE, env.getTruffleFile(path)).build());
                 sulongLibrary = (TruffleObject) callTarget.call();
             } catch (SecurityException | IOException e) {
-                throw raise(ImportError, "cannot load %s: %s", path, e.getMessage());
+                throw raise(ImportError, "cannot load %s: %m", path, e);
             } catch (RuntimeException e) {
                 throw reportImportError(e, path);
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/InteropModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/InteropModuleBuiltins.java
@@ -143,7 +143,7 @@ Object evalString(@SuppressWarnings("unused") PNone path, String value, String l
                 }
                 return env.parse(newBuilder.build()).call();
             } catch (RuntimeException e) {
-                throw raise(NotImplementedError, e.getMessage());
+                throw raise(NotImplementedError, e);
             }
         }
 
@@ -170,7 +170,7 @@ Object evalFile(String path, @SuppressWarnings("unused") PNone string, String la
             } catch (IOException e) {
                 throw raise(OSError, "%s", e);
             } catch (RuntimeException e) {
-                throw raise(NotImplementedError, e.getMessage());
+                throw raise(NotImplementedError, e);
             }
         }
 
@@ -183,7 +183,7 @@ Object evalFile(String path, @SuppressWarnings("unused") PNone string, @Suppress
             } catch (IOException e) {
                 throw raise(OSError, "%s", e);
             } catch (RuntimeException e) {
-                throw raise(NotImplementedError, e.getMessage());
+                throw raise(NotImplementedError, e);
             }
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java
@@ -757,7 +757,7 @@ private String decode(byte[] raw) {
             try {
                 return new String(raw, "ascii");
             } catch (UnsupportedEncodingException e) {
-                throw raise(PythonBuiltinClassType.UnicodeDecodeError, e.getMessage());
+                throw raise(PythonBuiltinClassType.UnicodeDecodeError, e);
             }
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixSubprocessModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixSubprocessModuleBuiltins.java
@@ -157,7 +157,7 @@ synchronized int forkExec(PList args, @SuppressWarnings("unused") PList execList
                     throw raise(PythonBuiltinClassType.OSError, "working directory %s is not accessible", cwd);
                 }
             } catch (SecurityException e) {
-                throw raise(PythonBuiltinClassType.OSError, e.getMessage());
+                throw raise(PythonBuiltinClassType.OSError, e);
             }
 
             Map<String, String> environment = pb.environment();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java
@@ -737,17 +737,12 @@ Object doIt(VirtualFrame frame,
                 context.setCurrentException(exceptionState);
                 return result;
             } catch (UnsupportedTypeException | UnsupportedMessageException e) {
-                throw context.getCore().raise(PythonBuiltinClassType.TypeError, "Calling native function %s failed: %s", name, getMessage(e));
+                throw context.getCore().raise(PythonBuiltinClassType.TypeError, "Calling native function %s failed: %m", name, e);
             } catch (ArityException e) {
                 throw context.getCore().raise(PythonBuiltinClassType.TypeError, "Calling native function %s expected %d arguments but got %d.", name, e.getExpectedArity(), e.getActualArity());
             }
         }
 
-        @TruffleBoundary
-        private static final String getMessage(Throwable e) {
-            return e.getMessage();
-        }
-
         private Object fromNative(Object result) {
             return fromForeign.executeConvert(result);
         }
@@ -833,11 +828,6 @@ protected static ByteBuffer wrap(byte[] data) {
         protected static ByteBuffer wrap(byte[] data, int offset, int length) {
             return ByteBuffer.wrap(data, offset, length);
         }
-
-        @TruffleBoundary
-        protected static String getMessage(Throwable throwable) {
-            return throwable.getMessage();
-        }
     }
 
     abstract static class NativeUnicodeBuiltin extends NativeBuiltin {
@@ -1007,11 +997,11 @@ Object doBytes(TruffleObject o, long elementSize, Object errorMarker,
                 }
                 return decoded.toString();
             } catch (CharacterCodingException e) {
-                return raiseNative(errorMarker, PythonErrorType.UnicodeError, e.getMessage());
+                return raiseNative(errorMarker, PythonErrorType.UnicodeError, "%m", e);
             } catch (IllegalArgumentException e) {
-                return raiseNative(errorMarker, PythonErrorType.LookupError, e.getMessage());
+                return raiseNative(errorMarker, PythonErrorType.LookupError, "%m", e);
             } catch (InteropException e) {
-                return raiseNative(errorMarker, PythonErrorType.TypeError, e.getMessage());
+                return raiseNative(errorMarker, PythonErrorType.TypeError, "%m", e);
             }
         }
 
@@ -1040,9 +1030,9 @@ Object doBytes(TruffleObject o, Object errorMarker,
                 CharBuffer cbuf = decoder.decode(wrap(getByteArrayNode.execute(o, -1)));
                 return cbuf.toString();
             } catch (CharacterCodingException e) {
-                return raiseNative(errorMarker, PythonErrorType.UnicodeError, e.getMessage());
+                return raiseNative(errorMarker, PythonErrorType.UnicodeError, "%m", e);
             } catch (InteropException e) {
-                return raiseNative(errorMarker, PythonErrorType.TypeError, e.getMessage());
+                return raiseNative(errorMarker, PythonErrorType.TypeError, "%m", e);
             }
         }
     }
@@ -1077,7 +1067,7 @@ Object doUnicode(PString s, String errors, Object error_marker) {
                 transformToNative(e);
                 return error_marker;
             } catch (CharacterCodingException e) {
-                return raiseNative(error_marker, PythonErrorType.UnicodeEncodeError, e.getMessage());
+                return raiseNative(error_marker, PythonErrorType.UnicodeEncodeError, "%m", e);
             }
         }
 
@@ -1150,12 +1140,12 @@ Object doUnicode(TruffleObject o, long size, String errors, int byteorder, Objec
                 CharBuffer decode = decoder.onMalformedInput(action).onUnmappableCharacter(action).decode(wrap(getByteArrayNode.execute(o, size), 0, (int) size));
                 return toSulongNode.execute(decode.toString());
             } catch (CharacterCodingException e) {
-                return raiseNative(errorMarker, PythonErrorType.UnicodeEncodeError, e.getMessage());
+                return raiseNative(errorMarker, PythonErrorType.UnicodeEncodeError, "%m", e);
             } catch (IllegalArgumentException e) {
                 String csName = getUTF32Name(byteorder);
                 return raiseNative(errorMarker, PythonErrorType.LookupError, "unknown encoding: " + csName);
             } catch (InteropException e) {
-                return raiseNative(errorMarker, PythonErrorType.TypeError, e.getMessage());
+                return raiseNative(errorMarker, PythonErrorType.TypeError, "%m", e);
             }
         }
     }
@@ -1229,7 +1219,7 @@ Object doUnicode(String s, long elementSize, long elements, Object errorMarker)
                 }
             } catch (IllegalArgumentException e) {
                 // TODO
-                return raiseNative(errorMarker, PythonErrorType.LookupError, e.getMessage());
+                return raiseNative(errorMarker, PythonErrorType.LookupError, "%m", e);
             }
         }
 
@@ -2156,7 +2146,7 @@ Object doGeneric(Object module, PythonNativeObject object,
             try {
                 return factory().createBytes(getByteArrayNode.execute(object.getPtr(), -1));
             } catch (InteropException e) {
-                return raiseNative(getNativeNullNode.execute(module), PythonErrorType.TypeError, getMessage(e));
+                return raiseNative(getNativeNullNode.execute(module), PythonErrorType.TypeError, "%m", e);
             }
         }
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ZLibModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ZLibModuleBuiltins.java
@@ -501,7 +501,7 @@ Object decompress(InflaterWrapper stream, PIBytesLike pb, int maxLen) {
                 try {
                     bytesWritten = stream.inflater.inflate(result, 0, result.length);
                 } catch (DataFormatException e) {
-                    throw raise(ZLibError, e.getMessage());
+                    throw raise(ZLibError, e);
                 }
                 baos.write(result, 0, bytesWritten);
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/BaseExceptionBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/BaseExceptionBuiltins.java
@@ -109,8 +109,8 @@ private GetLazyClassNode getGetClassNode() {
         @TruffleBoundary
         private String getFormattedMessage(String format, Object... args) {
             try {
-                // pre-format for '%p' which retrieves the Python class of an argument
-                if (format.contains("%p")) {
+                // pre-format for custom error message formatter
+                if (ErrorMessageFormatter.containsCustomSpecifier(format)) {
                     return formatter.format(getGetClassNode(), format, args);
                 }
                 return String.format(format, args);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java
@@ -546,7 +546,7 @@ public static PythonAbstractClass[] doSlowPath(Object obj) {
                 try {
                     return cast(SequenceStorageNodes.ToArrayNode.doSlowPath(basesTuple.getSequenceStorage()));
                 } catch (ClassCastException e) {
-                    throw PythonLanguage.getCore().raise(PythonBuiltinClassType.SystemError, "unsupported object in 'tp_bases' (msg: %s)", e.getMessage());
+                    throw PythonLanguage.getCore().raise(PythonBuiltinClassType.SystemError, "unsupported object in 'tp_bases' (msg: %m)", e);
                 }
             }
             throw new IllegalStateException("unknown type " + obj.getClass().getName());
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/TryExceptNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/TryExceptNode.java
@@ -148,7 +148,7 @@ private boolean shouldCatchAll() {
 
     @TruffleBoundary
     private PBaseException getBaseException(Exception t) {
-        return factory().createBaseException(PythonErrorType.ValueError, t.getMessage(), new Object[0]);
+        return factory().createBaseException(PythonErrorType.ValueError, "%m", new Object[]{t});
     }
 
     @ExplodeLoop
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/ErrorMessageFormatter.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/ErrorMessageFormatter.java
@@ -46,6 +46,7 @@
 
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetNameNode;
 import com.oracle.graal.python.nodes.object.GetLazyClassNode;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 
 /**
  * Custom formatter adding Python-specific conversions often required in error messages.
@@ -94,6 +95,14 @@ public String format(GetLazyClassNode getClassNode, String format, Object... arg
                 offset += name.length() - (m.end() - m.start());
                 args[matchIdx] = REMOVED_MARKER;
                 removedCnt++;
+            } else if ("%m".equals(group) && args[matchIdx] instanceof Throwable) {
+                // If the format arg is not a Throwable, 'String.format' will do the error handling
+                // and throw an IllegalFormatException for us.
+                String exceptionMessage = getMessage((Throwable) args[matchIdx]);
+                sb.replace(m.start() + offset, m.end() + offset, exceptionMessage);
+                offset += exceptionMessage.length() - (m.end() - m.start());
+                args[matchIdx] = REMOVED_MARKER;
+                removedCnt++;
             }
 
             idx = m.end();
@@ -105,13 +114,33 @@ public String format(GetLazyClassNode getClassNode, String format, Object... arg
         return String.format(sb.toString(), compact(args, removedCnt));
     }
 
+    @TruffleBoundary
+    private static String getMessage(Throwable exception) {
+        return exception.getMessage();
+    }
+
     private static String getClassName(GetLazyClassNode getClassNode, Object obj) {
         if (getClassNode != null) {
             return GetNameNode.doSlowPath(getClassNode.execute(obj));
         }
         return GetNameNode.doSlowPath(GetLazyClassNode.getUncached().execute(obj));
     }
 
+    /**
+     * Use this method to check if a given format string contains any of the custom format
+     * specifiers handled by this formatter.
+     */
+    public static boolean containsCustomSpecifier(String format) {
+        int pidx = -1;
+        while ((pidx = format.indexOf('%', pidx + 1)) != -1 && pidx + 1 < format.length()) {
+            char c = format.charAt(pidx + 1);
+            if (c == 'p' || c == 'P' || c == 'm') {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private static Object[] compact(Object[] args, int removedCnt) {
         Object[] compacted = new Object[args.length - removedCnt];
         int j = 0;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/InternalFormat.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/formatting/InternalFormat.java
@@ -32,7 +32,7 @@ private static Spec fromText(PythonCore core, String text) {
         try {
             return parser.parse();
         } catch (IllegalArgumentException e) {
-            throw core.raise(ValueError, e.getMessage());
+            throw core.raise(ValueError, "%m", e);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ private Object loadDynamicModuleWithSpec(String name, String path, InteropLibrar`
`179`	`179`	`CallTarget callTarget = env.parse(Source.newBuilder(LLVM_LANGUAGE, env.getTruffleFile(path)).build());`
`180`	`180`	`sulongLibrary = (TruffleObject) callTarget.call();`
`181`	`181`	`} catch (SecurityException \| IOException e) {`
`182`		`- throw raise(ImportError, "cannot load %s: %s", path, e.getMessage());`
	`182`	`+ throw raise(ImportError, "cannot load %s: %m", path, e);`
`183`	`183`	`} catch (RuntimeException e) {`
`184`	`184`	`throw reportImportError(e, path);`
`185`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ Object evalString(@SuppressWarnings("unused") PNone path, String value, String l`
`143`	`143`	`}`
`144`	`144`	`return env.parse(newBuilder.build()).call();`
`145`	`145`	`} catch (RuntimeException e) {`
`146`		`- throw raise(NotImplementedError, e.getMessage());`
	`146`	`+ throw raise(NotImplementedError, e);`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
`@@ -170,7 +170,7 @@ Object evalFile(String path, @SuppressWarnings("unused") PNone string, String la`
`170`	`170`	`} catch (IOException e) {`
`171`	`171`	`throw raise(OSError, "%s", e);`
`172`	`172`	`} catch (RuntimeException e) {`
`173`		`- throw raise(NotImplementedError, e.getMessage());`
	`173`	`+ throw raise(NotImplementedError, e);`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`
`@@ -183,7 +183,7 @@ Object evalFile(String path, @SuppressWarnings("unused") PNone string, @Suppress`
`183`	`183`	`} catch (IOException e) {`
`184`	`184`	`throw raise(OSError, "%s", e);`
`185`	`185`	`} catch (RuntimeException e) {`
`186`		`- throw raise(NotImplementedError, e.getMessage());`
	`186`	`+ throw raise(NotImplementedError, e);`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`
Original file line number	Diff line number	Diff line change
`@@ -757,7 +757,7 @@ private String decode(byte[] raw) {`
`757`	`757`	`try {`
`758`	`758`	`return new String(raw, "ascii");`
`759`	`759`	`} catch (UnsupportedEncodingException e) {`
`760`		`- throw raise(PythonBuiltinClassType.UnicodeDecodeError, e.getMessage());`
	`760`	`+ throw raise(PythonBuiltinClassType.UnicodeDecodeError, e);`
`761`	`761`	`}`
`762`	`762`	`}`
`763`	`763`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ synchronized int forkExec(PList args, @SuppressWarnings("unused") PList execList`
`157`	`157`	`throw raise(PythonBuiltinClassType.OSError, "working directory %s is not accessible", cwd);`
`158`	`158`	`}`
`159`	`159`	`} catch (SecurityException e) {`
`160`		`- throw raise(PythonBuiltinClassType.OSError, e.getMessage());`
	`160`	`+ throw raise(PythonBuiltinClassType.OSError, e);`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`Map<String, String> environment = pb.environment();`
Original file line number	Diff line number	Diff line change
`@@ -737,17 +737,12 @@ Object doIt(VirtualFrame frame,`
`737`	`737`	`context.setCurrentException(exceptionState);`
`738`	`738`	`return result;`
`739`	`739`	`} catch (UnsupportedTypeException \| UnsupportedMessageException e) {`
`740`		`- throw context.getCore().raise(PythonBuiltinClassType.TypeError, "Calling native function %s failed: %s", name, getMessage(e));`
	`740`	`+ throw context.getCore().raise(PythonBuiltinClassType.TypeError, "Calling native function %s failed: %m", name, e);`
`741`	`741`	`} catch (ArityException e) {`
`742`	`742`	`throw context.getCore().raise(PythonBuiltinClassType.TypeError, "Calling native function %s expected %d arguments but got %d.", name, e.getExpectedArity(), e.getActualArity());`
`743`	`743`	`}`
`744`	`744`	`}`
`745`	`745`
`746`		`- @TruffleBoundary`
`747`		`- private static final String getMessage(Throwable e) {`
`748`		`- return e.getMessage();`
`749`		`- }`
`750`		`-`
`751`	`746`	`private Object fromNative(Object result) {`
`752`	`747`	`return fromForeign.executeConvert(result);`
`753`	`748`	`}`
`@@ -833,11 +828,6 @@ protected static ByteBuffer wrap(byte[] data) {`
`833`	`828`	`protected static ByteBuffer wrap(byte[] data, int offset, int length) {`
`834`	`829`	`return ByteBuffer.wrap(data, offset, length);`
`835`	`830`	`}`
`836`		`-`
`837`		`- @TruffleBoundary`
`838`		`- protected static String getMessage(Throwable throwable) {`
`839`		`- return throwable.getMessage();`
`840`		`- }`
`841`	`831`	`}`
`842`	`832`
`843`	`833`	`abstract static class NativeUnicodeBuiltin extends NativeBuiltin {`
`@@ -1007,11 +997,11 @@ Object doBytes(TruffleObject o, long elementSize, Object errorMarker,`
`1007`	`997`	`}`
`1008`	`998`	`return decoded.toString();`
`1009`	`999`	`} catch (CharacterCodingException e) {`
`1010`		`- return raiseNative(errorMarker, PythonErrorType.UnicodeError, e.getMessage());`
	`1000`	`+ return raiseNative(errorMarker, PythonErrorType.UnicodeError, "%m", e);`
`1011`	`1001`	`} catch (IllegalArgumentException e) {`
`1012`		`- return raiseNative(errorMarker, PythonErrorType.LookupError, e.getMessage());`
	`1002`	`+ return raiseNative(errorMarker, PythonErrorType.LookupError, "%m", e);`
`1013`	`1003`	`} catch (InteropException e) {`
`1014`		`- return raiseNative(errorMarker, PythonErrorType.TypeError, e.getMessage());`
	`1004`	`+ return raiseNative(errorMarker, PythonErrorType.TypeError, "%m", e);`
`1015`	`1005`	`}`
`1016`	`1006`	`}`
`1017`	`1007`
`@@ -1040,9 +1030,9 @@ Object doBytes(TruffleObject o, Object errorMarker,`
`1040`	`1030`	`CharBuffer cbuf = decoder.decode(wrap(getByteArrayNode.execute(o, -1)));`
`1041`	`1031`	`return cbuf.toString();`
`1042`	`1032`	`} catch (CharacterCodingException e) {`
`1043`		`- return raiseNative(errorMarker, PythonErrorType.UnicodeError, e.getMessage());`
	`1033`	`+ return raiseNative(errorMarker, PythonErrorType.UnicodeError, "%m", e);`
`1044`	`1034`	`} catch (InteropException e) {`
`1045`		`- return raiseNative(errorMarker, PythonErrorType.TypeError, e.getMessage());`
	`1035`	`+ return raiseNative(errorMarker, PythonErrorType.TypeError, "%m", e);`
`1046`	`1036`	`}`
`1047`	`1037`	`}`
`1048`	`1038`	`}`
`@@ -1077,7 +1067,7 @@ Object doUnicode(PString s, String errors, Object error_marker) {`
`1077`	`1067`	`transformToNative(e);`
`1078`	`1068`	`return error_marker;`
`1079`	`1069`	`} catch (CharacterCodingException e) {`
`1080`		`- return raiseNative(error_marker, PythonErrorType.UnicodeEncodeError, e.getMessage());`
	`1070`	`+ return raiseNative(error_marker, PythonErrorType.UnicodeEncodeError, "%m", e);`
`1081`	`1071`	`}`
`1082`	`1072`	`}`
`1083`	`1073`
`@@ -1150,12 +1140,12 @@ Object doUnicode(TruffleObject o, long size, String errors, int byteorder, Objec`
`1150`	`1140`	`CharBuffer decode = decoder.onMalformedInput(action).onUnmappableCharacter(action).decode(wrap(getByteArrayNode.execute(o, size), 0, (int) size));`
`1151`	`1141`	`return toSulongNode.execute(decode.toString());`
`1152`	`1142`	`} catch (CharacterCodingException e) {`
`1153`		`- return raiseNative(errorMarker, PythonErrorType.UnicodeEncodeError, e.getMessage());`
	`1143`	`+ return raiseNative(errorMarker, PythonErrorType.UnicodeEncodeError, "%m", e);`
`1154`	`1144`	`} catch (IllegalArgumentException e) {`
`1155`	`1145`	`String csName = getUTF32Name(byteorder);`
`1156`	`1146`	`return raiseNative(errorMarker, PythonErrorType.LookupError, "unknown encoding: " + csName);`
`1157`	`1147`	`} catch (InteropException e) {`
`1158`		`- return raiseNative(errorMarker, PythonErrorType.TypeError, e.getMessage());`
	`1148`	`+ return raiseNative(errorMarker, PythonErrorType.TypeError, "%m", e);`
`1159`	`1149`	`}`
`1160`	`1150`	`}`
`1161`	`1151`	`}`
`@@ -1229,7 +1219,7 @@ Object doUnicode(String s, long elementSize, long elements, Object errorMarker)`
`1229`	`1219`	`}`
`1230`	`1220`	`} catch (IllegalArgumentException e) {`
`1231`	`1221`	`// TODO`
`1232`		`- return raiseNative(errorMarker, PythonErrorType.LookupError, e.getMessage());`
	`1222`	`+ return raiseNative(errorMarker, PythonErrorType.LookupError, "%m", e);`
`1233`	`1223`	`}`
`1234`	`1224`	`}`
`1235`	`1225`
`@@ -2156,7 +2146,7 @@ Object doGeneric(Object module, PythonNativeObject object,`
`2156`	`2146`	`try {`
`2157`	`2147`	`return factory().createBytes(getByteArrayNode.execute(object.getPtr(), -1));`
`2158`	`2148`	`} catch (InteropException e) {`
`2159`		`- return raiseNative(getNativeNullNode.execute(module), PythonErrorType.TypeError, getMessage(e));`
	`2149`	`+ return raiseNative(getNativeNullNode.execute(module), PythonErrorType.TypeError, "%m", e);`
`2160`	`2150`	`}`
`2161`	`2151`	`}`
`2162`	`2152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,7 @@ Object decompress(InflaterWrapper stream, PIBytesLike pb, int maxLen) {`
`501`	`501`	`try {`
`502`	`502`	`bytesWritten = stream.inflater.inflate(result, 0, result.length);`
`503`	`503`	`} catch (DataFormatException e) {`
`504`		`- throw raise(ZLibError, e.getMessage());`
	`504`	`+ throw raise(ZLibError, e);`
`505`	`505`	`}`
`506`	`506`	`baos.write(result, 0, bytesWritten);`
`507`	`507`	`}`
Original file line number	Diff line number	Diff line change
`@@ -546,7 +546,7 @@ public static PythonAbstractClass[] doSlowPath(Object obj) {`
`546`	`546`	`try {`
`547`	`547`	`return cast(SequenceStorageNodes.ToArrayNode.doSlowPath(basesTuple.getSequenceStorage()));`
`548`	`548`	`} catch (ClassCastException e) {`
`549`		`- throw PythonLanguage.getCore().raise(PythonBuiltinClassType.SystemError, "unsupported object in 'tp_bases' (msg: %s)", e.getMessage());`
	`549`	`+ throw PythonLanguage.getCore().raise(PythonBuiltinClassType.SystemError, "unsupported object in 'tp_bases' (msg: %m)", e);`
`550`	`550`	`}`
`551`	`551`	`}`
`552`	`552`	`throw new IllegalStateException("unknown type " + obj.getClass().getName());`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ private boolean shouldCatchAll() {`
`148`	`148`
`149`	`149`	`@TruffleBoundary`
`150`	`150`	`private PBaseException getBaseException(Exception t) {`
`151`		`- return factory().createBaseException(PythonErrorType.ValueError, t.getMessage(), new Object[0]);`
	`151`	`+ return factory().createBaseException(PythonErrorType.ValueError, "%m", new Object[]{t});`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`@ExplodeLoop`