Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge 3.3

Browse source
This commit is contained in:
Benjamin Peterson 2013-10-29 22:25:55 -04:00
commit 96c03df771
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Python/ceval.c
View file

@ -2716,7 +2716,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
} }
TARGET(WITH_CLEANUP) { TARGET(WITH_CLEANUP) {
/* At the top of the stack are 1-3 values indicating /* At the top of the stack are 1-6 values indicating
how/why we entered the finally clause: how/why we entered the finally clause:
- TOP = None - TOP = None
- (TOP, SECOND) = (WHY_{RETURN,CONTINUE}), retval - (TOP, SECOND) = (WHY_{RETURN,CONTINUE}), retval
@ -2729,9 +2729,9 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
otherwise we must call otherwise we must call
EXIT(None, None, None) EXIT(None, None, None)
In the first two cases, we remove EXIT from the In the first three cases, we remove EXIT from the
stack, leaving the rest in the same order. In the stack, leaving the rest in the same order. In the
third case, we shift the bottom 3 values of the fourth case, we shift the bottom 3 values of the
stack down, and replace the empty spot with NULL. stack down, and replace the empty spot with NULL.
In addition, if the stack represents an exception, In addition, if the stack represents an exception,