diff options
| author | Guido van Rossum <guido@python.org> | 2006-03-10 02:28:35 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2006-03-10 02:28:35 (GMT) |
| commit | f669436189dd44a841caa9ab1ad97a3f7662bf58 (patch) | |
| tree | 1a717975d09d4867e8807710a36a6c2999afdb7e /Lib/compiler | |
| parent | 692cdbc5d648da5239b5caececc954960aa024e9 (diff) | |
| download | cpython-f669436189dd44a841caa9ab1ad97a3f7662bf58.zip cpython-f669436189dd44a841caa9ab1ad97a3f7662bf58.tar.gz cpython-f669436189dd44a841caa9ab1ad97a3f7662bf58.tar.bz2 | |
Um, I thought I'd already checked this in.
Anyway, this is the changes to the with-statement
so that __exit__ must return a true value in order
for a pending exception to be ignored.
The PEP (343) is already updated.
Diffstat (limited to 'Lib/compiler')
| -rw-r--r-- | Lib/compiler/pyassem.py | 2 | ||||
| -rw-r--r-- | Lib/compiler/pycodegen.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Lib/compiler/pyassem.py b/Lib/compiler/pyassem.py index b59661f..82ff396 100644 --- a/Lib/compiler/pyassem.py +++ b/Lib/compiler/pyassem.py @@ -779,7 +779,7 @@ class StackDepthTracker: 'SETUP_EXCEPT': 3, 'SETUP_FINALLY': 3, 'FOR_ITER': 1, - 'WITH_CLEANUP': 3, + 'WITH_CLEANUP': -1, } # use pattern match patterns = [ diff --git a/Lib/compiler/pycodegen.py b/Lib/compiler/pycodegen.py index a1236de..2b3a24f 100644 --- a/Lib/compiler/pycodegen.py +++ b/Lib/compiler/pycodegen.py @@ -858,8 +858,6 @@ class CodeGenerator: self.nextBlock(final) self.setups.push((END_FINALLY, final)) self.emit('WITH_CLEANUP') - self.emit('CALL_FUNCTION', 3) - self.emit('POP_TOP') self.emit('END_FINALLY') self.setups.pop() self.__with_count -= 1 |