diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2007-09-04 09:18:06 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2007-09-04 09:18:06 (GMT) |
| commit | 85bcc66bb492931b6ca3de21ca53ca53b754be33 (patch) | |
| tree | 3e46f8d106d8ac338238c146480568dd4a3c0083 /Parser/parsetok.c | |
| parent | 53de1902e7a9788d2d4b917b1b14b2a76171f0f4 (diff) | |
| download | cpython-85bcc66bb492931b6ca3de21ca53ca53b754be33.zip cpython-85bcc66bb492931b6ca3de21ca53ca53b754be33.tar.gz cpython-85bcc66bb492931b6ca3de21ca53ca53b754be33.tar.bz2 | |
Convert code from sys.stdin.encoding to UTF-8 in
interactive mode. Fixes #1100.
Diffstat (limited to 'Parser/parsetok.c')
| -rw-r--r-- | Parser/parsetok.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Parser/parsetok.c b/Parser/parsetok.c index 71bed29..b9664ea 100644 --- a/Parser/parsetok.c +++ b/Parser/parsetok.c @@ -59,19 +59,20 @@ node * PyParser_ParseFile(FILE *fp, const char *filename, grammar *g, int start, char *ps1, char *ps2, perrdetail *err_ret) { - return PyParser_ParseFileFlags(fp, filename, g, start, ps1, ps2, - err_ret, 0); + return PyParser_ParseFileFlags(fp, filename, NULL, + g, start, ps1, ps2, err_ret, 0); } node * -PyParser_ParseFileFlags(FILE *fp, const char *filename, grammar *g, int start, +PyParser_ParseFileFlags(FILE *fp, const char *filename, const char* enc, + grammar *g, int start, char *ps1, char *ps2, perrdetail *err_ret, int flags) { struct tok_state *tok; initerr(err_ret, filename); - if ((tok = PyTokenizer_FromFile(fp, ps1, ps2)) == NULL) { + if ((tok = PyTokenizer_FromFile(fp, enc, ps1, ps2)) == NULL) { err_ret->error = E_NOMEM; return NULL; } |