https://github.com/python/cpython/commit/b455a5a55cb1fd5bb6178a969e8ebd0e6e91b610
commit: b455a5a55cb1fd5bb6178a969e8ebd0e6e91b610
branch: 3.12
author: Kirill Podoprigora <[email protected]>
committer: ambv <[email protected]>
date: 2024-07-15T21:26:10+02:00
summary:

[3.12] gh-121657: Display correct error message for yield from outsid… 
(GH-121769)

(cherry picked from commit 178e44de8f023be7a5dc400044ab61983b191f24)

Co-authored-by: Gregor <[email protected]>
Co-authored-by: Bénédikt Tran <[email protected]>

files:
A Misc/NEWS.d/next/Core and 
Builtins/2024-07-13-12-27-31.gh-issue-121657.wgOYLw.rst
M Lib/test/test_generators.py
M Python/compile.c

diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index 83ca8a6096c646..6bd78887bff66f 100644
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -2145,6 +2145,11 @@ def printsolution(self, x):
   ...
 SyntaxError: 'yield' outside function
 
+>>> yield from [1,2]
+Traceback (most recent call last):
+  ...
+SyntaxError: 'yield from' outside function
+
 >>> def f(): x = yield = y
 Traceback (most recent call last):
   ...
diff --git a/Misc/NEWS.d/next/Core and 
Builtins/2024-07-13-12-27-31.gh-issue-121657.wgOYLw.rst b/Misc/NEWS.d/next/Core 
and Builtins/2024-07-13-12-27-31.gh-issue-121657.wgOYLw.rst
new file mode 100644
index 00000000000000..cb18629d79f5ce
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and 
Builtins/2024-07-13-12-27-31.gh-issue-121657.wgOYLw.rst 
@@ -0,0 +1,2 @@
+Improve the :exc:`SyntaxError` message if the user tries to use
+:keyword:`yield from <yield>` outside a function.
diff --git a/Python/compile.c b/Python/compile.c
index bd1650e2337866..81464a974f59b7 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -6117,7 +6117,7 @@ compiler_visit_expr1(struct compiler *c, expr_ty e)
         break;
     case YieldFrom_kind:
         if (!_PyST_IsFunctionLike(c->u->u_ste)) {
-            return compiler_error(c, loc, "'yield' outside function");
+            return compiler_error(c, loc, "'yield from' outside function");
         }
         if (c->u->u_scope_type == COMPILER_SCOPE_ASYNC_FUNCTION) {
             return compiler_error(c, loc, "'yield from' inside async 
function");

_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]

Reply via email to