From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 4 May 2021 01:06:45 +0000 (-0700)
Subject: bpo-43822: Prioritize tokenizer errors over custom syntax errors when raising parser... 
X-Git-Tag: v3.10.0b2~169
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=756b7b9248885d65c2b3b9f1c5a8f66aa2e8de7a;p=thirdparty%2FPython%2Fcpython.git

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

(cherry picked from commit 9142088e7454a392b69a627863b235ecc32aea54)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
---

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index bc0404ea4b04..3c427fed5611 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -210,7 +210,7 @@ class ExceptionTests(unittest.TestCase):
         check('x = "a', 1, 5)
         check('lambda x: x = 2', 1, 1)
         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('[file for\n str(file) in []]', 2, 2)
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-05-04-01-01-04.bpo-43822.9VeCg0.rst b/Misc/NEWS.d/next/Core and Builtins/2021-05-04-01-01-04.bpo-43822.9VeCg0.rst
new file mode 100644
index 000000000000..b8815cddf4e2
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-05-04-01-01-04.bpo-43822.9VeCg0.rst	
@@ -0,0 +1,2 @@
+The parser will prioritize tokenizer errors over custom syntax errors when
+raising exceptions. Patch by Pablo Galindo.
diff --git a/Parser/pegen.c b/Parser/pegen.c
index e32b2710dbda..6080cec1489e 100644
--- a/Parser/pegen.c
+++ b/Parser/pegen.c
@@ -1283,6 +1283,9 @@ _PyPegen_run_parser(Parser *p)
         reset_parser_state(p);
         _PyPegen_parse(p);
         if (PyErr_Occurred()) {
+            if (PyErr_ExceptionMatches(PyExc_SyntaxError)) {
+                _PyPegen_check_tokenizer_errors(p);
+            }
             return NULL;
         }
         if (p->fill == 0) {