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

bpo-44335: Fix a regression when identifying invalid characters in syntax errors (GH-26589)

Browse source
This commit is contained in:
Pablo Galindo 2021-06-08 12:25:22 +01:00 • committed by GitHub
parent 6d518bb3a1
commit d334c73b56
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

1
Lib/test/test_exceptions.py
View file

@ -211,6 +211,7 @@ class ExceptionTests(unittest.TestCase):
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])', 2, 2) check('[file for str(file) in []\n])', 2, 2)
check('a = « hello » « world »', 1, 5)
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)
check("ages = {'Alice'=22, 'Bob'=23}", 1, 16) check("ages = {'Alice'=22, 'Bob'=23}", 1, 16)

2
Misc/NEWS.d/next/Core and Builtins/2021-06-08-01-13-47.bpo-44335.GQTTkl.rst Normal file
View file

@ -0,0 +1,2 @@
Fix a regression when identifying incorrect characters in syntax errors.
Patch by Pablo Galindo

4
Parser/pegen.c
View file

@ -1288,7 +1288,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)) { // 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); _PyPegen_check_tokenizer_errors(p);
} }
return NULL; return NULL;