(Merge 3.4) Issue #22762: Fix _Py_DisplaySourceLine(), clear the exception if

vstinner · vstinner · commit 3188f828bb62 · 2014-10-30T10:17:59.000+01:00
PyFile_GetLine() failed. Patch written by Xavier de Gaye.
diff --git a/Python/traceback.c b/Python/traceback.c
@@ -322,6 +322,7 @@ _Py_DisplaySourceLine(PyObject *f, PyObject *filename, int lineno, int indent)
         Py_XDECREF(lineobj);
         lineobj = PyFile_GetLine(fob, -1);
         if (!lineobj) {
+            PyErr_Clear();
             err = -1;
             break;
         }

Original file line number	Diff line number	Diff line change
`@@ -322,6 +322,7 @@ _Py_DisplaySourceLine(PyObject f, PyObject filename, int lineno, int indent)`
`322`	`322`	`Py_XDECREF(lineobj);`
`323`	`323`	`lineobj = PyFile_GetLine(fob, -1);`
`324`	`324`	`if (!lineobj) {`
	`325`	`+ PyErr_Clear();`
`325`	`326`	`err = -1;`
`326`	`327`	`break;`
`327`	`328`	`}`