mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

Recorded merge of revisions 85569-85570 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85569 | victor.stinner | 2010-10-16 15:14:10 +0200 (sam., 16 oct. 2010) | 4 lines

  Issue #9713, #10114: Parser functions (eg. PyParser_ASTFromFile) expects
  filenames encoded to the filesystem encoding with surrogateescape error handler
  (to support undecodable bytes), instead of UTF-8 in strict mode.
........
  r85570 | victor.stinner | 2010-10-16 15:42:53 +0200 (sam., 16 oct. 2010) | 4 lines

  Fix ast_error_finish() and err_input(): filename can be NULL

  Fix my previous commit (r85569).
........
This commit is contained in:
Victor Stinner 2010-10-19 01:22:07 +00:00
parent 089144e511
commit 15244f7b12
7 changed files with 81 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Python/ast.c
View file

@ -102,6 +102,7 @@ static void
ast_error_finish(const char *filename)
{
PyObject *type, *value, *tback, *errstr, *loc, *tmp;
PyObject *filename_obj;
long lineno;
assert(PyErr_Occurred());
@ -125,7 +126,16 @@ ast_error_finish(const char *filename)
Py_INCREF(Py_None);
loc = Py_None;
}
tmp = Py_BuildValue("(zlOO)", filename, lineno, Py_None, loc);
if (filename != NULL)
filename_obj = PyUnicode_DecodeFSDefault(filename);
else {
Py_INCREF(Py_None);
filename_obj = Py_None;
}
if (filename_obj != NULL)
tmp = Py_BuildValue("(NlOO)", filename_obj, lineno, Py_None, loc);
else
tmp = NULL;
Py_DECREF(loc);
if (!tmp) {
Py_DECREF(errstr);