commit ceceaa00bab93bfd8b0035e4ad482bba74ae4f8e
author Victor Stinner <victor.stinner@gmail.com> Tue Jul 16 00:32:14 2013 +0200
committer Victor Stinner <victor.stinner@gmail.com> Tue Jul 16 00:32:14 2013 +0200
tree 58b3927e28a4c920531bed855e88aaaf9d5913d4
parent 7eab0d000cd12d76f90d4a80df1b728d3ff94728

Issue #18408: Fix _Py_DisplaySourceLine()

Report _Py_FindSourceFile() error, so the error is cleared;
and clear io.open(filename) exception on failure.

Python/traceback.c

diff --git a/Python/traceback.c b/Python/traceback.c
index c56b23f..8130d4b 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -246,10 +246,12 @@
     binary = _PyObject_CallMethodId(io, &PyId_open, "Os", filename, "rb");
 
     if (binary == NULL) {
+        PyErr_Clear();
+
         binary = _Py_FindSourceFile(filename, buf, sizeof(buf), io);
         if (binary == NULL) {
             Py_DECREF(io);
-            return 0;
+            return -1;
         }
     }