diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-06-08 11:46:56 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-08 11:46:56 (GMT) |
| commit | 933b5b63598968c1ab4976f92570696a33c72cc4 (patch) | |
| tree | a7335ead2f8290807b12bd21a5eb9b073b255944 /Parser | |
| parent | d80f4265db63a1692455abb8d1c77d0d72151bbb (diff) | |
| download | cpython-933b5b63598968c1ab4976f92570696a33c72cc4.zip cpython-933b5b63598968c1ab4976f92570696a33c72cc4.tar.gz cpython-933b5b63598968c1ab4976f92570696a33c72cc4.tar.bz2 | |
bpo-44335: Fix a regression when identifying invalid characters in syntax errors (GH-26589)
(cherry picked from commit d334c73b56756e90c33ce06e3a6ec23271aa099d)
Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
Diffstat (limited to 'Parser')
| -rw-r--r-- | Parser/pegen.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Parser/pegen.c b/Parser/pegen.c index aac7e36..c69a042 100644 --- a/Parser/pegen.c +++ b/Parser/pegen.c @@ -1288,7 +1288,9 @@ _PyPegen_run_parser(Parser *p) reset_parser_state(p); _PyPegen_parse(p); if (PyErr_Occurred()) { - if (PyErr_ExceptionMatches(PyExc_SyntaxError)) { + // Prioritize tokenizer errors to custom syntax errors raised + // on the second phase only if the errors come from the parser. + if (p->tok->done != E_ERROR && PyErr_ExceptionMatches(PyExc_SyntaxError)) { _PyPegen_check_tokenizer_errors(p); } return NULL; |