From 5272fa9c5707b3cdcd6f49fdaf595b21bec6b2bd Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 19 Dec 2013 13:39:32 +0100
Subject: Fix _Py_DisplaySourceLine(), if PyTokenizer_FindEncodingFilename()
 fails, clear the exception to not call open() with an exception set.

---
 Python/traceback.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Python/traceback.c')

diff --git a/Python/traceback.c b/Python/traceback.c
index e9169ce5e0..2ece192db9 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -264,6 +264,8 @@ _Py_DisplaySourceLine(PyObject *f, PyObject *filename, int lineno, int indent)
         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) {
-- 
cgit v1.2.1