Issue #19817: Fix print_exception(), clear the exception on error

1c557acb · Victor Stinner · dda0d1ee · 1c557acb
Commit 1c557acb authored Dec 09, 2013 by Victor Stinner
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

Python/pythonrun.c Python/pythonrun.c +5 -3

No files found.
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1888,9 +1888,11 @@ print_exception(PyObject *f, PyObject *value)
    _Py_IDENTIFIER(print_file_and_line);

    if (!PyExceptionInstance_Check(value)) {
-        PyFile_WriteString("TypeError: print_exception(): Exception expected for value, ", f);
-        PyFile_WriteString(Py_TYPE(value)->tp_name, f);
-        PyFile_WriteString(" found\n", f);
+        err = PyFile_WriteString("TypeError: print_exception(): Exception expected for value, ", f);
+        err += PyFile_WriteString(Py_TYPE(value)->tp_name, f);
+        err += PyFile_WriteString(" found\n", f);
+        if (err)
+            PyErr_Clear();
        return;
    }