mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PyErr_NormalizeException doesn't like being called with an exception set 

(issues #21677, #21310).
This commit is contained in:
Serhiy Storchaka 2014-06-11 07:19:39 +03:00
parent 915d14190e 76d3f14e01
commit ec87a13e5d
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/_io/_iomodule.c
View File

@ -470,14 +470,14 @@ io_open(PyObject *self, PyObject *args, PyObject *kwds)
if (_PyObject_CallMethodId(result, &PyId_close, NULL) != NULL) if (_PyObject_CallMethodId(result, &PyId_close, NULL) != NULL)
PyErr_Restore(exc, val, tb); PyErr_Restore(exc, val, tb);
else { else {
PyObject *val2; PyObject *exc2, *val2, *tb2;
PyErr_Fetch(&exc2, &val2, &tb2);
PyErr_NormalizeException(&exc, &val, &tb); PyErr_NormalizeException(&exc, &val, &tb);
Py_XDECREF(exc); Py_XDECREF(exc);
Py_XDECREF(tb); Py_XDECREF(tb);
PyErr_Fetch(&exc, &val2, &tb); PyErr_NormalizeException(&exc2, &val2, &tb2);
PyErr_NormalizeException(&exc, &val2, &tb);
PyException_SetContext(val2, val); PyException_SetContext(val2, val);
PyErr_Restore(exc, val2, tb); PyErr_Restore(exc2, val2, tb2);
} }
Py_DECREF(result); Py_DECREF(result);
} }

8
Modules/_io/bufferedio.c
View File

@ -548,14 +548,14 @@ buffered_close(buffered *self, PyObject *args)
PyErr_Restore(exc, val, tb); PyErr_Restore(exc, val, tb);
} }
else { else {
PyObject *val2; PyObject *exc2, *val2, *tb2;
PyErr_Fetch(&exc2, &val2, &tb2);
PyErr_NormalizeException(&exc, &val, &tb); PyErr_NormalizeException(&exc, &val, &tb);
Py_DECREF(exc); Py_DECREF(exc);
Py_XDECREF(tb); Py_XDECREF(tb);
PyErr_Fetch(&exc, &val2, &tb); PyErr_NormalizeException(&exc2, &val2, &tb2);
PyErr_NormalizeException(&exc, &val2, &tb);
PyException_SetContext(val2, val); PyException_SetContext(val2, val);
PyErr_Restore(exc, val2, tb); PyErr_Restore(exc2, val2, tb2);
} }
} }

8
Modules/_io/textio.c
View File

@ -2619,14 +2619,14 @@ textiowrapper_close(textio *self, PyObject *args)
PyErr_Restore(exc, val, tb); PyErr_Restore(exc, val, tb);
} }
else { else {
PyObject *val2; PyObject *exc2, *val2, *tb2;
PyErr_Fetch(&exc2, &val2, &tb2);
PyErr_NormalizeException(&exc, &val, &tb); PyErr_NormalizeException(&exc, &val, &tb);
Py_DECREF(exc); Py_DECREF(exc);
Py_XDECREF(tb); Py_XDECREF(tb);
PyErr_Fetch(&exc, &val2, &tb); PyErr_NormalizeException(&exc2, &val2, &tb2);
PyErr_NormalizeException(&exc, &val2, &tb);
PyException_SetContext(val2, val); PyException_SetContext(val2, val);
PyErr_Restore(exc, val2, tb); PyErr_Restore(exc2, val2, tb2);
} }
} }
return res; return res;