diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-02-05 02:12:14 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-02-05 02:12:14 (GMT) |
| commit | 565d78586babda2b62cbe4f89c2dd3cace79c0fa (patch) | |
| tree | aded6af69242e82a89f34df49512202d5c2ae08a /Python/compile.c | |
| parent | 4a7ff1d80abf841287043c5965d1c1c74a1c694a (diff) | |
| download | cpython-565d78586babda2b62cbe4f89c2dd3cace79c0fa.zip cpython-565d78586babda2b62cbe4f89c2dd3cace79c0fa.tar.gz cpython-565d78586babda2b62cbe4f89c2dd3cace79c0fa.tar.bz2 | |
normalize exceptions passed to the __exit__ method #7853
In Python 2.x, exceptions in finally blocks are not normalized. Since with
statements are implemented using finally blocks, ceval.c had to be tweaked to
distinguish between with finally blocks and normal ones.
A test for the finalization of generators containing with statements was also
added.
Diffstat (limited to 'Python/compile.c')
| -rw-r--r-- | Python/compile.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Python/compile.c b/Python/compile.c index 1e27539..4ea2ee9 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -2927,6 +2927,9 @@ compiler_with(struct compiler *c, stmt_ty s) /* SETUP_WITH pushes a finally block. */ compiler_use_next_block(c, block); + /* Note that the block is actually called SETUP_WITH in ceval.c, but + functions the same as SETUP_FINALLY except that exceptions are + normalized. */ if (!compiler_push_fblock(c, FINALLY_TRY, block)) { return 0; } |