| Index: Python/import.c |
| =================================================================== |
| --- Python/import.c (révision 87441) |
| +++ Python/import.c (copie de travail) |
| @@ -123,9 +123,6 @@ |
| /* This table is defined in config.c: */ |
| extern struct _inittab _PyImport_Inittab[]; |
| -/* Method from Parser/tokenizer.c */ |
| -extern char * PyTokenizer_FindEncoding(int); |
| - |
| struct _inittab *PyImport_Inittab = _PyImport_Inittab; |
| /* these tables define the module suffixes that Python recognizes */ |
| @@ -3174,9 +3171,9 @@ |
| } |
| if (fd != -1) { |
| if (strchr(fdp->mode, 'b') == NULL) { |
| - /* PyTokenizer_FindEncoding() returns PyMem_MALLOC'ed |
| + /* PyTokenizer_FindEncodingFilename() returns PyMem_MALLOC'ed |
| memory. */ |
| - found_encoding = PyTokenizer_FindEncoding(fd); |
| + found_encoding = PyTokenizer_FindEncodingFilename(fd, pathname); |
| lseek(fd, 0, 0); /* Reset position */ |
| if (found_encoding == NULL && PyErr_Occurred()) |
| return NULL; |