diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-10-19 01:22:07 +0000 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-10-19 01:22:07 +0000 |
| commit | aedc66768fa6db278693fa02239a081858493425 (patch) | |
| tree | 8a6c2896b813e27ab721c093b80ccb0e7dd88cc9 /Parser | |
| parent | 4f8fc1567ecca1c9ac10931674fda912e5bdc157 (diff) | |
| download | cpython-aedc66768fa6db278693fa02239a081858493425.tar.gz | |
Recorded merge of revisions 85569-85570 via svnmerge from
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).
........
Diffstat (limited to 'Parser')
| -rw-r--r-- | Parser/tokenizer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Parser/tokenizer.h b/Parser/tokenizer.h index 5a6d0601f8..c153cbf8f2 100644 --- a/Parser/tokenizer.h +++ b/Parser/tokenizer.h @@ -40,7 +40,7 @@ struct tok_state { int level; /* () [] {} Parentheses nesting level */ /* Used to allow free continuations inside them */ /* Stuff for checking on different tab sizes */ - const char *filename; /* For error messages */ + const char *filename; /* encoded to the filesystem encoding */ int altwarning; /* Issue warning if alternate tabs don't match */ int alterror; /* Issue error if alternate tabs don't match */ int alttabsize; /* Alternate tab spacing */ |