Commit 78e2c985 authored by Victor Stinner's avatar Victor Stinner

Issue #18408: Fix show_warning(), clear also the exception raised by

_Py_DisplaySourceLine()

For example, _PyGC_DumpShutdownStats() calls PyErr_WarnExplicitFormat() while
the import machinery does not work anymore, _Py_DisplaySourceLine() fails when
trying to import the io module.
parent f243ee40
...@@ -283,9 +283,9 @@ show_warning(PyObject *filename, int lineno, PyObject *text, PyObject ...@@ -283,9 +283,9 @@ show_warning(PyObject *filename, int lineno, PyObject *text, PyObject
PyFile_WriteString(source_line_str, f_stderr); PyFile_WriteString(source_line_str, f_stderr);
PyFile_WriteString("\n", f_stderr); PyFile_WriteString("\n", f_stderr);
} }
else else {
if (_Py_DisplaySourceLine(f_stderr, filename, lineno, 2) < 0) _Py_DisplaySourceLine(f_stderr, filename, lineno, 2);
return; }
PyErr_Clear(); PyErr_Clear();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment