[Python-checkins] cpython (3.4): Issue #22762: Fix _Py_DisplaySourceLine(), clear the exception if

victor.stinner python-checkins at python.org
Thu Oct 30 10:19:26 CET 2014


https://hg.python.org/cpython/rev/9dddc95ef31e
changeset:   93260:9dddc95ef31e
branch:      3.4
parent:      93254:9d36bf887be3
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Thu Oct 30 10:17:27 2014 +0100
summary:
  Issue #22762: Fix _Py_DisplaySourceLine(), clear the exception if
PyFile_GetLine() failed. Patch written by Xavier de Gaye.

files:
  Python/traceback.c |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Python/traceback.c b/Python/traceback.c
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -322,6 +322,7 @@
         Py_XDECREF(lineobj);
         lineobj = PyFile_GetLine(fob, -1);
         if (!lineobj) {
+            PyErr_Clear();
             err = -1;
             break;
         }

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list