diff options
| author | Jeffrey Yasskin <jyasskin@gmail.com> | 2008-12-10 07:28:12 +0000 |
|---|---|---|
| committer | Jeffrey Yasskin <jyasskin@gmail.com> | 2008-12-10 07:28:12 +0000 |
| commit | 478a1aa5373be89a6c7464fe1303aa585631acea (patch) | |
| tree | 011c900524ea6f2d01a6773bcad964d80e6759ac /Python | |
| parent | 05e9c9dd970976885ade53a1bf09506d2aeb1c8a (diff) | |
| download | cpython-git-478a1aa5373be89a6c7464fe1303aa585631acea.tar.gz | |
Backported issue #4589 to Python 2.5.3: Propagated an exception thrown by a
context manager's __exit__ method's result while it's being converted to bool.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index ddfe3c48ea..d74149c4a9 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2263,9 +2263,16 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) x = PyObject_CallFunctionObjArgs(x, u, v, w, NULL); if (x == NULL) break; /* Go to error exit */ - if (u != Py_None && PyObject_IsTrue(x)) { + if (u != Py_None) + err = PyObject_IsTrue(x); + else + err = 0; + Py_DECREF(x); + if (err < 0) + break; /* Go to error exit */ + else if (err > 0) { + err = 0; /* There was an exception and a true return */ - Py_DECREF(x); x = TOP(); /* Again */ STACKADJ(-3); Py_INCREF(Py_None); @@ -2276,7 +2283,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) Py_DECREF(w); } else { /* Let END_FINALLY do its thing */ - Py_DECREF(x); x = POP(); Py_DECREF(x); } |