mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-21 17:25:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Backported issue #4589 to Python 2.5.3: Propagated an exception thrown by a

Browse source 
context manager's __exit__ method's result while it's being converted to bool.
This commit is contained in:
Jeffrey Yasskin 2008-12-10 07:28:12 +00:00
parent 05e9c9dd97
commit 478a1aa537
3 changed files with 42 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Python/ceval.c
View file

@ -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);
}