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

prevent generator finalization from invalidating sys.exc_info() #7173

Browse source
This commit is contained in:
Benjamin Peterson 2010-03-07 17:10:51 +00:00
parent 0e4c22c922
commit ae5f2f4a39
3 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Python/ceval.c
View file

@ -1159,7 +1159,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
assert(stack_pointer != NULL);
f->f_stacktop = NULL; /* remains NULL unless yield suspends frame */
if (f->f_code->co_flags & CO_GENERATOR) {
if (co->co_flags & CO_GENERATOR && !throwflag) {
if (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