mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

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

Browse source 
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
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; return 0;
} }
found_encoding = PyTokenizer_FindEncodingFilename(fd, filename); found_encoding = PyTokenizer_FindEncodingFilename(fd, filename);
if (found_encoding == NULL)
PyErr_Clear();
encoding = (found_encoding != NULL) ? found_encoding : "utf-8"; encoding = (found_encoding != NULL) ? found_encoding : "utf-8";
/* Reset position */ /* Reset position */
if (lseek(fd, 0, SEEK_SET) == (off_t)-1) { if (lseek(fd, 0, SEEK_SET) == (off_t)-1) {