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

bpo-43822: Prioritize tokenizer errors over custom syntax errors when raising parser exceptions (GH-25866)

Browse source 
(cherry picked from commit 9142088e74)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
This commit is contained in:
Miss Islington (bot) 2021-05-03 18:06:45 -07:00 • committed by GitHub
parent 4d58730a3a
commit 756b7b9248
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_exceptions.py
View file

@ -210,7 +210,7 @@ class ExceptionTests(unittest.TestCase):
check('x = "a', 1, 5) check('x = "a', 1, 5)
check('lambda x: x = 2', 1, 1) check('lambda x: x = 2', 1, 1)
check('f{a + b + c}', 1, 2) check('f{a + b + c}', 1, 2)
check('[file for str(file) in []\n])', 1, 11) check('[file for str(file) in []\n])', 2, 2)
check('[\nfile\nfor str(file)\nin\n[]\n]', 3, 5) check('[\nfile\nfor str(file)\nin\n[]\n]', 3, 5)
check('[file for\n str(file) in []]', 2, 2) check('[file for\n str(file) in []]', 2, 2)

2
Misc/NEWS.d/next/Core and Builtins/2021-05-04-01-01-04.bpo-43822.9VeCg0.rst Normal file
View file

@ -0,0 +1,2 @@
The parser will prioritize tokenizer errors over custom syntax errors when
raising exceptions. Patch by Pablo Galindo.

3
Parser/pegen.c
View file

@ -1283,6 +1283,9 @@ _PyPegen_run_parser(Parser *p)
reset_parser_state(p); reset_parser_state(p);
_PyPegen_parse(p); _PyPegen_parse(p);
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
if (PyErr_ExceptionMatches(PyExc_SyntaxError)) {
_PyPegen_check_tokenizer_errors(p);
}
return NULL; return NULL;
} }
if (p->fill == 0) { if (p->fill == 0) {