diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-10-30 02:25:55 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-10-30 02:25:55 (GMT) |
| commit | 96c03df771199196f4580d4fd32f6cea902fb2ec (patch) | |
| tree | 62b6b523cf1e7ffa5764acc902ab3503a36929dc /Python/ceval.c | |
| parent | 856f45f09c1fe69cab4cf11159f60f0f0cc5bb07 (diff) | |
| parent | 8f169489c484cd4918a6dd0fde712cd11f1d4367 (diff) | |
| download | cpython-96c03df771199196f4580d4fd32f6cea902fb2ec.zip cpython-96c03df771199196f4580d4fd32f6cea902fb2ec.tar.gz cpython-96c03df771199196f4580d4fd32f6cea902fb2ec.tar.bz2 | |
merge 3.3
Diffstat (limited to 'Python/ceval.c')
| -rw-r--r-- | Python/ceval.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 5f49615..d4d8466 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2716,7 +2716,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) } 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: - TOP = None - (TOP, SECOND) = (WHY_{RETURN,CONTINUE}), retval @@ -2729,9 +2729,9 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) otherwise we must call 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 - 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. In addition, if the stack represents an exception, |