don't let a tuple msg be interpreted as arguments to AssertionError (closes #13268)
This commit is contained in:
parent
78fc70503e
commit
0c0d756098
|
@ -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.
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue