don't let a tuple msg be interpreted as arguments to AssertionError (closes #13268)

benjaminp · benjaminp · commit 0c0d7560987a · 2011-10-27T08:21:59.000-04:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -9,6 +9,8 @@ What's New in Python 2.7.3?
 Core and Builtins
 -----------------
 
+- Issue #13268: Fix the assert statement when a tuple is passed as the message.
+
 - Issue #13018: Fix reference leaks in error paths in dictobject.c.
   Patch by Suman Saha.
 
diff --git a/Python/compile.c b/Python/compile.c
@@ -2079,11 +2079,9 @@ compiler_assert(struct compiler *c, stmt_ty s)
     ADDOP_O(c, LOAD_GLOBAL, assertion_error, names);
     if (s->v.Assert.msg) {
         VISIT(c, expr, s->v.Assert.msg);
-        ADDOP_I(c, RAISE_VARARGS, 2);
-    }
-    else {
-        ADDOP_I(c, RAISE_VARARGS, 1);
+        ADDOP_I(c, CALL_FUNCTION, 1);
     }
+    ADDOP_I(c, RAISE_VARARGS, 1);
     compiler_use_next_block(c, end);
     return 1;
 }

Original file line number	Diff line number	Diff line change
`@@ -2079,11 +2079,9 @@ compiler_assert(struct compiler *c, stmt_ty s)`
`2079`	`2079`	`ADDOP_O(c, LOAD_GLOBAL, assertion_error, names);`
`2080`	`2080`	`if (s->v.Assert.msg) {`
`2081`	`2081`	`VISIT(c, expr, s->v.Assert.msg);`
`2082`		`- ADDOP_I(c, RAISE_VARARGS, 2);`
`2083`		`- }`
`2084`		`- else {`
`2085`		`- ADDOP_I(c, RAISE_VARARGS, 1);`
	`2082`	`+ ADDOP_I(c, CALL_FUNCTION, 1);`
`2086`	`2083`	`}`
	`2084`	`+ ADDOP_I(c, RAISE_VARARGS, 1);`
`2087`	`2085`	`compiler_use_next_block(c, end);`
`2088`	`2086`	`return 1;`
`2089`	`2087`	`}`