mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-28 04:35:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #23353: Fix the exception handling of generators in PyEval_EvalFrameEx().

Browse source 
At entry, save or swap the exception state even if PyEval_EvalFrameEx() is
called with throwflag=0. At exit, the exception state is now always restored or
swapped, not only if why is WHY_YIELD or WHY_RETURN. Patch co-written with
Antoine Pitrou.
This commit is contained in:
Victor Stinner 2015-01-31 10:29:47 +01:00
parent fdc995336f
commit 26f7b8acdc
3 changed files with 119 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Python/ceval.c
View file

@ -1189,8 +1189,8 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
f->f_stacktop = NULL; /* remains NULL unless yield suspends frame */
f->f_executing = 1;
if (co->co_flags & CO_GENERATOR && !throwflag) {
if (f->f_exc_type != NULL && f->f_exc_type != Py_None) {
if (co->co_flags & CO_GENERATOR) {
if (!throwflag && f->f_exc_type != NULL && f->f_exc_type != Py_None) {
/* We were in an except handler when we left,
restore the exception state which was put aside
(see YIELD_VALUE). */
@ -3172,7 +3172,8 @@ fast_block_end:
|| (retval == NULL && PyErr_Occurred()));
fast_yield:
if (co->co_flags & CO_GENERATOR && (why == WHY_YIELD || why == WHY_RETURN)) {
if (co->co_flags & CO_GENERATOR) {
/* The purpose of this block is to put aside the generator's exception
state and restore that of the calling frame. If the current
exception state is from the caller, we clear the exception values