Mercurial > cpython-lru_cache-weakref
diff Python/ceval.c @ 50103:9a10d4404bd0 legacy-trunk
#4559: When a context manager's __exit__() method returns an object whose
conversion to bool raises an exception, 'with' loses that exception.
Reviewed by Jeffrey Yasskin.
Already ported to 2.5, will port to 2.6 and 3.0
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> |
|---|---|
| date | Wed, 10 Dec 2008 23:22:49 +0000 |
| parents | dc696deb2cf2 |
| children | 94e79d78dff0 |
line wrap: on
line diff
--- a/Python/ceval.c Wed Dec 10 07:35:02 2008 +0000 +++ b/Python/ceval.c Wed Dec 10 23:22:49 2008 +0000 @@ -2349,11 +2349,20 @@ /* XXX Not the fastest way to call it... */ x = PyObject_CallFunctionObjArgs(exit_func, u, v, w, NULL); - if (x == NULL) { - Py_DECREF(exit_func); + Py_DECREF(exit_func); + 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 */ STACKADJ(-2); Py_INCREF(Py_None); @@ -2365,8 +2374,6 @@ /* The stack was rearranged to remove EXIT above. Let END_FINALLY do its thing */ } - Py_DECREF(x); - Py_DECREF(exit_func); PREDICT(END_FINALLY); break; }