traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Victor Stinner 2013-07-16 01:54:37 +02:00
parent f243ee4055
commit 78e2c985ac
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Python/_warnings.c
View File

@ -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();
}