Assert statement shouldn't convert message to string

Author: msimacek

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

@@ -47,5 +47,15 @@ def test_assert(self):
         except:
             pass
         else:
-            raise Exception("Assertions doesn't work!")
+            raise Exception("Assertions don't work!")
+
+    def test_assert_message(self):
+        try:
+            assert False, 1
+        except AssertionError as e:
+            if e.args != (1,):
+                raise Exception(f"Expected AssertionError.args to be {(1,)}, was {e.args}")
+        else:
+            raise Exception("Assertions don't work!")
+
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/AssertNode.java

@@ -30,8 +30,6 @@
 import java.io.PrintStream;
 
 import com.oracle.graal.python.nodes.PRaiseNode;
-import com.oracle.graal.python.nodes.SpecialMethodNames;
-import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
 import com.oracle.graal.python.nodes.expression.CoerceToBooleanNode;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.graal.python.runtime.PythonContext;
@@ -47,7 +45,6 @@ public class AssertNode extends StatementNode {
     @Child private PRaiseNode raise;
     @Child private CoerceToBooleanNode condition;
     @Child private ExpressionNode message;
-    @Child private LookupAndCallUnaryNode callNode;
     @CompilationFinal private Boolean assertionsEnabled = null;
 
     private final ConditionProfile profile = ConditionProfile.createBinaryProfile();
@@ -83,15 +80,10 @@ public void executeVoid(VirtualFrame frame) {
     }
 
     private PException assertionFailed(VirtualFrame frame) {
-        String assertionMessage = null;
+        Object assertionMessage = null;
         if (message != null) {
             try {
-                Object messageObj = message.execute(frame);
-                if (callNode == null) {
-                    CompilerDirectives.transferToInterpreterAndInvalidate();
-                    callNode = insert(LookupAndCallUnaryNode.create(SpecialMethodNames.__STR__));
-                }
-                assertionMessage = (String) callNode.executeObject(frame, messageObj);
+                assertionMessage = message.execute(frame);
             } catch (PException e) {
                 // again, Python exceptions just fall through
                 throw e;

graalpython/lib-graalpython/python_cext.py

@@ -581,29 +581,29 @@ def PySequence_Contains(haystack, needle):
 @may_raise
 def PySequence_Repeat(obj, n):
     if not PySequence_Check(obj):
-        raise TypeError("'%p' object can't be repeated", obj)
+        raise TypeError("'%s' object can't be repeated" % type(obj))
     return obj * n
 
 
 @may_raise
 def PySequence_InPlaceRepeat(obj, n):
     if not PySequence_Check(obj):
-        raise TypeError("'%p' object can't be repeated", obj)
+        raise TypeError("'%s' object can't be repeated" % type(obj))
     obj *= n
     return obj
 
 
 @may_raise
 def PySequence_Concat(s, o):
     if not (PySequence_Check(s) and PySequence_Check(o)):
-        raise TypeError("'%p' object can't be repeated", s)
+        raise TypeError("'%s' object can't be concatenated" % type(s))
     return s + o
 
 
 @may_raise
 def PySequence_InPlaceConcat(s, o):
     if not (PySequence_Check(s) and PySequence_Check(o)):
-        raise TypeError("'%p' object can't be repeated", s)
+        raise TypeError("'%s' object can't be concatenated" % type(s))
     s += o
     return s