summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-02-28 03:16:11 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-02-28 03:16:11 (GMT)
commit3263f6874a96c7b2862bd91460a28e66ac039dbe (patch)
tree7a730e6a8890fa5909b5500966cc838eac4862a5 /Python
parent738f88f688b7e490725bdcc9186a888998ca0370 (diff)
downloadcpython-3263f6874a96c7b2862bd91460a28e66ac039dbe.zip
cpython-3263f6874a96c7b2862bd91460a28e66ac039dbe.tar.gz
cpython-3263f6874a96c7b2862bd91460a28e66ac039dbe.tar.bz2
Issue #22836: Keep exception reports sensible despite errors
Diffstat (limited to 'Python')
-rw-r--r--Python/errors.c16
-rw-r--r--Python/pythonrun.c8
2 files changed, 19 insertions, 5 deletions
diff --git a/Python/errors.c b/Python/errors.c
index 5ff1e4c..47d7c4b 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -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;
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index ebedd12..c03b073 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -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);