From 78e2c985ac4b43fc0c0595197d7d255358930fda Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 16 Jul 2013 01:54:37 +0200 Subject: 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. --- Python/_warnings.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Python/_warnings.c b/Python/_warnings.c index 03e0c45..f93ede2 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -283,9 +283,9 @@ show_warning(PyObject *filename, int lineno, PyObject *text, PyObject PyFile_WriteString(source_line_str, f_stderr); PyFile_WriteString("\n", f_stderr); } - else - if (_Py_DisplaySourceLine(f_stderr, filename, lineno, 2) < 0) - return; + else { + _Py_DisplaySourceLine(f_stderr, filename, lineno, 2); + } PyErr_Clear(); } -- cgit v0.12