mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-06 08:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #9713, #10114: Parser functions (eg. PyParser_ASTFromFile) expects

Browse source 
filenames encoded to the filesystem encoding with surrogateescape error handler
(to support undecodable bytes), instead of UTF-8 in strict mode.
This commit is contained in:
Victor Stinner 2010-10-16 13:14:10 +00:00
parent 5a7913eb3b
commit 4c7c8c3023
7 changed files with 69 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Python/pythonrun.c
View file

@ -1213,7 +1213,7 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
d = PyModule_GetDict(m);
if (PyDict_GetItemString(d, "__file__") == NULL) {
PyObject *f;
f = PyUnicode_FromString(filename);
f = PyUnicode_DecodeFSDefault(filename);
if (f == NULL)
return -1;
if (PyDict_SetItemString(d, "__file__", f) < 0) {
@ -1968,7 +1968,9 @@ err_input(perrdetail *err)
{
PyObject *v, *w, *errtype, *errtext;
PyObject *msg_obj = NULL;
PyObject *filename;
char *msg = NULL;
errtype = PyExc_SyntaxError;
switch (err->error) {
case E_ERROR:
@ -2052,8 +2054,12 @@ err_input(perrdetail *err)
errtext = PyUnicode_DecodeUTF8(err->text, strlen(err->text),
"replace");
}
v = Py_BuildValue("(ziiN)", err->filename,
err->lineno, err->offset, errtext);
filename = PyUnicode_DecodeFSDefault(err->filename);
if (filename != NULL)
v = Py_BuildValue("(NiiN)", filename,
err->lineno, err->offset, errtext);
else
v = NULL;
if (v != NULL) {
if (msg_obj)
w = Py_BuildValue("(OO)", msg_obj, v);