(original) (raw)

changeset: 84649:9213313b1a6f user: Victor Stinner victor.stinner@gmail.com date: Tue Jul 16 01:54:37 2013 +0200 files: Python/_warnings.c description: 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. diff -r 92a9ccb2a521 -r 9213313b1a6f Python/_warnings.c --- a/Python/_warnings.c Tue Jul 16 01:02:12 2013 +0200 +++ b/Python/_warnings.c Tue Jul 16 01:54:37 2013 +0200 @@ -283,9 +283,9 @@ 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(); } /victor.stinner@gmail.com