Mercurial > cpython-lru_cache-weakref
diff Python/ceval.c @ 50099:694d04ed2b43 2.5
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.
| author | Jeffrey Yasskin <jyasskin@gmail.com> |
|---|---|
| date | Wed, 10 Dec 2008 07:28:12 +0000 |
| parents | 43fa50b9eb12 |
| children | a6ddd94983ea |
line wrap: on
line diff
--- a/Python/ceval.c Sun Nov 30 13:31:22 2008 +0000 +++ b/Python/ceval.c Wed Dec 10 07:28:12 2008 +0000 @@ -2263,9 +2263,16 @@ 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 @@ Py_DECREF(w); } else { /* Let END_FINALLY do its thing */ - Py_DECREF(x); x = POP(); Py_DECREF(x); }