diff options
| author | Collin Winter <collinw@gmail.com> | 2007-08-31 00:04:24 (GMT) |
|---|---|---|
| committer | Collin Winter <collinw@gmail.com> | 2007-08-31 00:04:24 (GMT) |
| commit | 828f04ac3f0dd3b68b4dbf42a79ebb846d1de568 (patch) | |
| tree | 21e25d3d969ce636c32539e4d4b5255dc4c85702 /Python/compile.c | |
| parent | 150b7d7d02eca6970d792f3e6887f957a36b6ca2 (diff) | |
| download | cpython-828f04ac3f0dd3b68b4dbf42a79ebb846d1de568.zip cpython-828f04ac3f0dd3b68b4dbf42a79ebb846d1de568.tar.gz cpython-828f04ac3f0dd3b68b4dbf42a79ebb846d1de568.tar.bz2 | |
Issue #1066: implement PEP 3109, 2/3 of PEP 3134.
Diffstat (limited to 'Python/compile.c')
| -rw-r--r-- | Python/compile.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/Python/compile.c b/Python/compile.c index 3a21127..e569102 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -2187,11 +2187,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); ADDOP(c, POP_TOP); return 1; @@ -2244,17 +2242,13 @@ compiler_visit_stmt(struct compiler *c, stmt_ty s) return compiler_if(c, s); case Raise_kind: n = 0; - if (s->v.Raise.type) { - VISIT(c, expr, s->v.Raise.type); + if (s->v.Raise.exc) { + VISIT(c, expr, s->v.Raise.exc); n++; - if (s->v.Raise.inst) { - VISIT(c, expr, s->v.Raise.inst); - n++; - if (s->v.Raise.tback) { - VISIT(c, expr, s->v.Raise.tback); - n++; - } - } + if (s->v.Raise.cause) { + VISIT(c, expr, s->v.Raise.cause); + n++; + } } ADDOP_I(c, RAISE_VARARGS, n); break; |