diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-04-18 15:19:00 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-04-18 15:19:00 (GMT) |
| commit | 6e3358a1d59acfd9507cd9a7b4513319b99d21ab (patch) | |
| tree | ed3540fd785e50d4aba3337e3b410f00d5917194 /Objects | |
| parent | eca851815d654c6e6ef50fe0b38b9e9c6076ceea (diff) | |
| parent | e42fb307edbdc8bb98fa5d43646cbbe33f307501 (diff) | |
| download | cpython-6e3358a1d59acfd9507cd9a7b4513319b99d21ab.zip cpython-6e3358a1d59acfd9507cd9a7b4513319b99d21ab.tar.gz cpython-6e3358a1d59acfd9507cd9a7b4513319b99d21ab.tar.bz2 | |
merge 3.2 (#14612)
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/frameobject.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Objects/frameobject.c b/Objects/frameobject.c index b33d72b..c8b8b1d 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -199,6 +199,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno) case SETUP_LOOP: case SETUP_EXCEPT: case SETUP_FINALLY: + case SETUP_WITH: blockstack[blockstack_top++] = addr; in_finally[blockstack_top-1] = 0; break; @@ -206,7 +207,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno) case POP_BLOCK: assert(blockstack_top > 0); setup_op = code[blockstack[blockstack_top-1]]; - if (setup_op == SETUP_FINALLY) { + if (setup_op == SETUP_FINALLY || setup_op == SETUP_WITH) { in_finally[blockstack_top-1] = 1; } else { @@ -221,7 +222,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno) * be seeing such an END_FINALLY.) */ if (blockstack_top > 0) { setup_op = code[blockstack[blockstack_top-1]]; - if (setup_op == SETUP_FINALLY) { + if (setup_op == SETUP_FINALLY || setup_op == SETUP_WITH) { blockstack_top--; } } @@ -283,6 +284,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno) case SETUP_LOOP: case SETUP_EXCEPT: case SETUP_FINALLY: + case SETUP_WITH: delta_iblock++; break; |