diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-03-07 17:14:15 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-03-07 17:14:15 (GMT) |
| commit | d01444d325c0e62b846b795e3443e97932271e17 (patch) | |
| tree | 19ac172e2887aeec92eb8d915601ff8e9f49a796 /Python | |
| parent | 056c060589a2c90eea2555495b83ba04de850d28 (diff) | |
| download | cpython-d01444d325c0e62b846b795e3443e97932271e17.zip cpython-d01444d325c0e62b846b795e3443e97932271e17.tar.gz cpython-d01444d325c0e62b846b795e3443e97932271e17.tar.bz2 | |
Merged revisions 78766 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r78766 | benjamin.peterson | 2010-03-07 11:10:51 -0600 (Sun, 07 Mar 2010) | 1 line
prevent generator finalization from invalidating sys.exc_info() #7173
........
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 8a24f11..f793db3 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1107,7 +1107,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 |