mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-07 10:28:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merged revisions 67688 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67688 | amaury.forgeotdarc | 2008-12-11 00:22:49 +0100 (jeu., 11 déc. 2008) | 6 lines

  #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
........
This commit is contained in:
Amaury Forgeot d'Arc 2008-12-10 23:56:33 +00:00
parent c9d4efdf48
commit 79c9f76629
3 changed files with 46 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Python/ceval.c
View file

@ -2337,11 +2337,20 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
/* 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);
@ -2353,8 +2362,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
/* 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;
}