diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-02-28 03:29:51 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-02-28 03:29:51 (GMT) |
| commit | 8cacc6300258264ff0598478073a7a0e6a3c1be8 (patch) | |
| tree | 43479294368be68500c525f32b0f1cf2202478dc /Python/pythonrun.c | |
| parent | b8d75035f2a2ae17d20532fe2a70dce52430442c (diff) | |
| parent | 3263f6874a96c7b2862bd91460a28e66ac039dbe (diff) | |
| download | cpython-8cacc6300258264ff0598478073a7a0e6a3c1be8.zip cpython-8cacc6300258264ff0598478073a7a0e6a3c1be8.tar.gz cpython-8cacc6300258264ff0598478073a7a0e6a3c1be8.tar.bz2 | |
Issue #22836: Merge exception reporting from 3.5
Diffstat (limited to 'Python/pythonrun.c')
| -rw-r--r-- | Python/pythonrun.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 8829699..cc2de9a 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); |