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

vstinner · vstinner · commit 78e2c985ac4b · 2013-07-16T01:54:37.000+02:00
_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 --git 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();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -283,9 +283,9 @@ show_warning(PyObject filename, int lineno, PyObject text, PyObject`
`283`	`283`	`PyFile_WriteString(source_line_str, f_stderr);`
`284`	`284`	`PyFile_WriteString("\n", f_stderr);`
`285`	`285`	`}`
`286`		`- else`
`287`		`- if (_Py_DisplaySourceLine(f_stderr, filename, lineno, 2) < 0)`
`288`		`- return;`
	`286`	`+ else {`
	`287`	`+ _Py_DisplaySourceLine(f_stderr, filename, lineno, 2);`
	`288`	`+ }`
`289`	`289`	`PyErr_Clear();`
`290`	`290`	`}`
`291`	`291`