mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #22836: Keep exception reports sensible despite errors

Browse source
This commit is contained in:
Martin Panter 2016-02-28 03:16:11 +00:00
parent 738f88f688
commit 3263f6874a
5 changed files with 92 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Python/errors.c
View file

@ -900,8 +900,12 @@ PyErr_WriteUnraisable(PyObject *obj)
if (obj) {
if (PyFile_WriteString("Exception ignored in: ", f) < 0)
goto done;
if (PyFile_WriteObject(obj, f, 0) < 0)
goto done;
if (PyFile_WriteObject(obj, f, 0) < 0) {
PyErr_Clear();
if (PyFile_WriteString("<object repr() failed>", f) < 0) {
goto done;
}
}
if (PyFile_WriteString("\n", f) < 0)
goto done;
}
@ -946,8 +950,12 @@ PyErr_WriteUnraisable(PyObject *obj)
if (v && v != Py_None) {
if (PyFile_WriteString(": ", f) < 0)
goto done;
if (PyFile_WriteObject(v, f, Py_PRINT_RAW) < 0)
goto done;
if (PyFile_WriteObject(v, f, Py_PRINT_RAW) < 0) {
PyErr_Clear();
if (PyFile_WriteString("<exception str() failed>", f) < 0) {
goto done;
}
}
}
if (PyFile_WriteString("\n", f) < 0)
goto done;

8
Python/pythonrun.c
View file

@ -766,8 +766,11 @@ print_exception(PyObject *f, PyObject *value)
/* only print colon if the str() of the
object is not the empty string
*/
if (s == NULL)
if (s == NULL) {
PyErr_Clear();
err = -1;
PyFile_WriteString(": <exception str() failed>", f);
}
else if (!PyUnicode_Check(s) ||
PyUnicode_GetLength(s) != 0)
err = PyFile_WriteString(": ", f);
@ -776,6 +779,9 @@ print_exception(PyObject *f, PyObject *value)
Py_XDECREF(s);
}
/* try to write a newline in any case */
if (err < 0) {
PyErr_Clear();
}
err += PyFile_WriteString("\n", f);
Py_XDECREF(tb);
Py_DECREF(value);