diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-04-05 01:48:03 +0200 | 
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-04-05 01:48:03 +0200 | 
| commit | fe7c5b5bdf7c21551b56be563fc604f2d4d3c756 (patch) | |
| tree | 831d9e33e02ad3e1c9bf2d0c113a9de8cdad5770 /Python/traceback.c | |
| parent | 7f2fee36401f7b987a368fe043637b3ae7116600 (diff) | |
| download | cpython-git-fe7c5b5bdf7c21551b56be563fc604f2d4d3c756.tar.gz | |
Issue #9319: Include the filename in "Non-UTF8 code ..." syntax error.
Diffstat (limited to 'Python/traceback.c')
| -rw-r--r-- | Python/traceback.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/Python/traceback.c b/Python/traceback.c index f0142da792..e74a1474df 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -18,8 +18,8 @@  #define MAX_FRAME_DEPTH 100  #define MAX_NTHREADS 100 -/* Method from Parser/tokenizer.c */ -extern char * PyTokenizer_FindEncoding(int); +/* Function from Parser/tokenizer.c */ +extern char * PyTokenizer_FindEncodingFilename(int, PyObject *);  static PyObject *  tb_dir(PyTracebackObject *self) @@ -251,7 +251,7 @@ _Py_DisplaySourceLine(PyObject *f, PyObject *filename, int lineno, int indent)      /* use the right encoding to decode the file as unicode */      fd = PyObject_AsFileDescriptor(binary); -    found_encoding = PyTokenizer_FindEncoding(fd); +    found_encoding = PyTokenizer_FindEncodingFilename(fd, filename);      encoding = (found_encoding != NULL) ? found_encoding : "utf-8";      lseek(fd, 0, 0); /* Reset position */      fob = PyObject_CallMethod(io, "TextIOWrapper", "Os", binary, encoding);  | 
