From c52141200364898818956a73b955f7c04f634dc8 Mon Sep 17 00:00:00 2001
From: Pablo Galindo Salgado <Pablogsal@gmail.com>
Date: Tue, 7 Dec 2021 15:23:33 +0000
Subject: [3.10] bpo-46004: Fix error location for loops with invalid targets
(GH-29959). (GH-29961)
(cherry picked from commit 1c7a1c3be08ee911d347fffd2716f3911ba751f9)
Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
---
Lib/test/test_exceptions.py | 1 +
.../next/Core and Builtins/2021-12-07-11-24-24.bpo-46004.TTEU1p.rst | 2 ++
Parser/pegen.h | 3 ++-
3 files changed, 5 insertions(+), 1 deletion(-)
create mode 100644 Misc/NEWS.d/next/Core and Builtins/2021-12-07-11-24-24.bpo-46004.TTEU1p.rst
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index ad2864b..bc5f83a 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -234,6 +234,7 @@ class ExceptionTests(unittest.TestCase):
check("ages = {'Alice'=22, 'Bob'=23}", 1, 16)
check('match ...:\n case {**rest, "key": value}:\n ...', 2, 19)
check("[a b c d e f]", 1, 2)
+ check("for x yfff:", 1, 7)
# Errors thrown by compile.c
check('class foo:return 1', 1, 11)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-12-07-11-24-24.bpo-46004.TTEU1p.rst b/Misc/NEWS.d/next/Core and Builtins/2021-12-07-11-24-24.bpo-46004.TTEU1p.rst
new file mode 100644
index 0000000..199bccf
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-12-07-11-24-24.bpo-46004.TTEU1p.rst
@@ -0,0 +1,2 @@
+Fix the :exc:`SyntaxError` location for errors involving for loops with
+invalid targets. Patch by Pablo Galindo
diff --git a/Parser/pegen.h b/Parser/pegen.h
index 04c7b9d..29d4805 100644
--- a/Parser/pegen.h
+++ b/Parser/pegen.h
@@ -321,8 +321,9 @@ _RAISE_SYNTAX_ERROR_INVALID_TARGET(Parser *p, TARGETS_TYPE type, void *e)
msg,
_PyPegen_get_expr_name(invalid_target)
);
+ return RAISE_SYNTAX_ERROR_KNOWN_LOCATION(invalid_target, "invalid syntax");
}
- return RAISE_SYNTAX_ERROR("invalid syntax");
+ return NULL;
}
void *_PyPegen_arguments_parsing_error(Parser *, expr_ty);
--
cgit v0.12