traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix _Py_DisplaySourceLine(), if PyTokenizer_FindEncodingFilename() fails, clear 

the exception to not call open() with an exception set.
This commit is contained in:
Victor Stinner 2013-12-19 13:39:32 +01:00
parent f326665fe7
commit 5272fa9c57
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Python/traceback.c
View File

@ -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) {