commit 5272fa9c5707b3cdcd6f49fdaf595b21bec6b2bd
author Victor Stinner <victor.stinner@gmail.com> Thu Dec 19 13:39:32 2013 +0100
committer Victor Stinner <victor.stinner@gmail.com> Thu Dec 19 13:39:32 2013 +0100
tree a67e2267c4c178ff38947bdbf2ed08c41263cb22
parent f326665fe7d89df3617b142749c195187ba56d0e

Fix _Py_DisplaySourceLine(), if PyTokenizer_FindEncodingFilename() fails, clear
the exception to not call open() with an exception set.

Python/traceback.c

diff --git a/Python/traceback.c b/Python/traceback.c
index e9169ce..2ece192 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -264,6 +264,8 @@
         return 0;
     }
     found_encoding = PyTokenizer_FindEncodingFilename(fd, filename);
+    if (found_encoding == NULL)
+        PyErr_Clear();
     encoding = (found_encoding != NULL) ? found_encoding : "utf-8";
     /* Reset position */
     if (lseek(fd, 0, SEEK_SET) == (off_t)-1) {