From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 15 Jul 2013 23:54:37 +0000 (+0200)
Subject: Issue #18408: Fix show_warning(), clear also the exception raised by
X-Git-Tag: v3.4.0a1~197
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78e2c985ac4b43fc0c0595197d7d255358930fda;p=python

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 --git a/Python/_warnings.c b/Python/_warnings.c
index 03e0c4545a..f93ede2e2f 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();
 }