From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 1 Jan 2020 03:28:08 +0000 (-0800)
Subject: bpo-39176: Improve error message for 'named assignment' (GH-17777) (GH-17778)
X-Git-Tag: v3.8.2rc1~118
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c004955aceb8a0cd8e14afbc608ebfdf7c8aa4a;p=thirdparty%2FPython%2Fcpython.git

bpo-39176: Improve error message for 'named assignment' (GH-17777) (GH-17778)

(cherry picked from commit 37143a8e3b2e9245d52f4ddebbdd1c6121c96884)

Co-authored-by: Ned Batchelder <ned@nedbatchelder.com>

Co-authored-by: Ned Batchelder <ned@nedbatchelder.com>
---

diff --git a/Lib/test/test_named_expressions.py b/Lib/test/test_named_expressions.py
index 01e26c8dfaf2..3ae557f78d27 100644
--- a/Lib/test/test_named_expressions.py
+++ b/Lib/test/test_named_expressions.py
@@ -32,7 +32,7 @@ class NamedExpressionInvalidTest(unittest.TestCase):
     def test_named_expression_invalid_06(self):
         code = """((a, b) := (1, 2))"""
 
-        with self.assertRaisesRegex(SyntaxError, "cannot use named assignment with tuple"):
+        with self.assertRaisesRegex(SyntaxError, "cannot use assignment expressions with tuple"):
             exec(code, {}, {})
 
     def test_named_expression_invalid_07(self):
@@ -90,7 +90,7 @@ class NamedExpressionInvalidTest(unittest.TestCase):
         code = """(lambda: x := 1)"""
 
         with self.assertRaisesRegex(SyntaxError,
-            "cannot use named assignment with lambda"):
+            "cannot use assignment expressions with lambda"):
             exec(code, {}, {})
 
     def test_named_expression_invalid_16(self):
diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 3829746f1799..128c4da14384 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -45,7 +45,7 @@ SyntaxError: cannot assign to True
 
 >>> (True := 1)
 Traceback (most recent call last):
-SyntaxError: cannot use named assignment with True
+SyntaxError: cannot use assignment expressions with True
 
 >>> obj.__debug__ = 1
 Traceback (most recent call last):
diff --git a/Python/ast.c b/Python/ast.c
index e70ab519e66e..6cf71ce7bb81 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -1955,7 +1955,7 @@ ast_for_namedexpr(struct compiling *c, const node *n)
     if (target->kind != Name_kind) {
         const char *expr_name = get_expr_name(target);
         if (expr_name != NULL) {
-            ast_error(c, n, "cannot use named assignment with %s", expr_name);
+            ast_error(c, n, "cannot use assignment expressions with %s", expr_name);
         }
         return NULL;
     }