https://github.com/python/cpython/commit/dbca27cfca7da44cb102c1e10508a08cebddd9d7
commit: dbca27cfca7da44cb102c1e10508a08cebddd9d7
branch: main
author: Stan Ulbrych <89152624+stanfromirel...@users.noreply.github.com>
committer: serhiy-storchaka <storch...@gmail.com>
date: 2025-05-10T15:00:43+03:00
summary:
gh-133379: Fix misuse of the term "arguments" in error messages (GH-133382)
The right term is "parameters".
files:
A
Misc/NEWS.d/next/Core_and_Builtins/2025-04-04-16-41-00.gh-issue-133379.asdjhjdf.rst
M Doc/whatsnew/3.15.rst
M Grammar/python.gram
M Lib/test/test_codeop.py
M Lib/test/test_positional_only_arg.py
M Lib/test/test_pyrepl/test_interact.py
M Lib/test/test_repl.py
M Lib/test/test_syntax.py
M Parser/parser.c
M Python/symtable.c
diff --git a/Doc/whatsnew/3.15.rst b/Doc/whatsnew/3.15.rst
index d1e58c1b764eb9..6ce7f964020fb9 100644
--- a/Doc/whatsnew/3.15.rst
+++ b/Doc/whatsnew/3.15.rst
@@ -75,6 +75,9 @@ New features
Other language changes
======================
+* Several error messages incorrectly using the term "argument" have been
corrected.
+ (Contributed by Stan Ulbrych in :gh:`133382`.)
+
New modules
diff --git a/Grammar/python.gram b/Grammar/python.gram
index f3ef990923eec3..3a4db11038dc22 100644
--- a/Grammar/python.gram
+++ b/Grammar/python.gram
@@ -1305,7 +1305,7 @@ invalid_dict_comprehension:
RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "dict unpacking cannot be used in
dict comprehension") }
invalid_parameters:
| a="/" ',' {
- RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "at least one argument must
precede /") }
+ RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "at least one parameter must
precede /") }
| (slash_no_default | slash_with_default) param_maybe_default* a='/' {
RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "/ may appear only once") }
| slash_no_default? param_no_default* invalid_parameters_helper
a=param_no_default {
@@ -1319,21 +1319,21 @@ invalid_parameters:
invalid_default:
| a='=' &(')'|',') { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "expected
default value expression") }
invalid_star_etc:
- | a='*' (')' | ',' (')' | '**')) { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a,
"named arguments must follow bare *") }
+ | a='*' (')' | ',' (')' | '**')) { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a,
"named parameters must follow bare *") }
| '*' ',' TYPE_COMMENT { RAISE_SYNTAX_ERROR("bare * has associated type
comment") }
- | '*' param a='=' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "var-positional
argument cannot have default value") }
+ | '*' param a='=' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "var-positional
parameter cannot have default value") }
| '*' (param_no_default | ',') param_maybe_default* a='*'
(param_no_default | ',') {
- RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "* argument may appear only
once") }
+ RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "* may appear only once") }
invalid_kwds:
- | '**' param a='=' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "var-keyword
argument cannot have default value") }
- | '**' param ',' a=param { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "arguments
cannot follow var-keyword argument") }
- | '**' param ',' a[Token*]=('*'|'**'|'/') {
RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "arguments cannot follow var-keyword
argument") }
+ | '**' param a='=' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "var-keyword
parameter cannot have default value") }
+ | '**' param ',' a=param { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a,
"parameters cannot follow var-keyword parameter") }
+ | '**' param ',' a[Token*]=('*'|'**'|'/') {
RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "parameters cannot follow var-keyword
parameter") }
invalid_parameters_helper: # This is only there to avoid type errors
| a=slash_with_default { _PyPegen_singleton_seq(p, a) }
| param_with_default+
invalid_lambda_parameters:
| a="/" ',' {
- RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "at least one argument must
precede /") }
+ RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "at least one parameter must
precede /") }
| (lambda_slash_no_default | lambda_slash_with_default)
lambda_param_maybe_default* a='/' {
RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "/ may appear only once") }
| lambda_slash_no_default? lambda_param_no_default*
invalid_lambda_parameters_helper a=lambda_param_no_default {
@@ -1348,14 +1348,14 @@ invalid_lambda_parameters_helper:
| a=lambda_slash_with_default { _PyPegen_singleton_seq(p, a) }
| lambda_param_with_default+
invalid_lambda_star_etc:
- | '*' (':' | ',' (':' | '**')) { RAISE_SYNTAX_ERROR("named arguments must
follow bare *") }
- | '*' lambda_param a='=' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a,
"var-positional argument cannot have default value") }
+ | '*' (':' | ',' (':' | '**')) { RAISE_SYNTAX_ERROR("named parameters must
follow bare *") }
+ | '*' lambda_param a='=' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a,
"var-positional parameter cannot have default value") }
| '*' (lambda_param_no_default | ',') lambda_param_maybe_default* a='*'
(lambda_param_no_default | ',') {
- RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "* argument may appear only
once") }
+ RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "* may appear only once") }
invalid_lambda_kwds:
- | '**' lambda_param a='=' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a,
"var-keyword argument cannot have default value") }
- | '**' lambda_param ',' a=lambda_param {
RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "arguments cannot follow var-keyword
argument") }
- | '**' lambda_param ',' a[Token*]=('*'|'**'|'/') {
RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "arguments cannot follow var-keyword
argument") }
+ | '**' lambda_param a='=' { RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a,
"var-keyword parameter cannot have default value") }
+ | '**' lambda_param ',' a=lambda_param {
RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "parameters cannot follow var-keyword
parameter") }
+ | '**' lambda_param ',' a[Token*]=('*'|'**'|'/') {
RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "parameters cannot follow var-keyword
parameter") }
invalid_double_type_comments:
| TYPE_COMMENT NEWLINE TYPE_COMMENT NEWLINE INDENT {
RAISE_SYNTAX_ERROR("Cannot have two type comments on def") }
diff --git a/Lib/test/test_codeop.py b/Lib/test/test_codeop.py
index 0eefc22d11bce0..ed10bd3dcb6d2b 100644
--- a/Lib/test/test_codeop.py
+++ b/Lib/test/test_codeop.py
@@ -322,7 +322,7 @@ def test_syntax_errors(self):
dedent("""\
def foo(x,x):
pass
- """), "duplicate argument 'x' in function definition")
+ """), "duplicate parameter 'x' in function definition")
diff --git a/Lib/test/test_positional_only_arg.py
b/Lib/test/test_positional_only_arg.py
index eea0625012da6d..e412cb1d58d5db 100644
--- a/Lib/test/test_positional_only_arg.py
+++ b/Lib/test/test_positional_only_arg.py
@@ -37,8 +37,8 @@ def test_invalid_syntax_errors(self):
check_syntax_error(self, "def f(/): pass")
check_syntax_error(self, "def f(*, a, /): pass")
check_syntax_error(self, "def f(*, /, a): pass")
- check_syntax_error(self, "def f(a, /, a): pass", "duplicate argument
'a' in function definition")
- check_syntax_error(self, "def f(a, /, *, a): pass", "duplicate
argument 'a' in function definition")
+ check_syntax_error(self, "def f(a, /, a): pass", "duplicate parameter
'a' in function definition")
+ check_syntax_error(self, "def f(a, /, *, a): pass", "duplicate
parameter 'a' in function definition")
check_syntax_error(self, "def f(a, b/2, c): pass")
check_syntax_error(self, "def f(a, /, c, /): pass")
check_syntax_error(self, "def f(a, /, c, /, d): pass")
@@ -59,8 +59,8 @@ def test_invalid_syntax_errors_async(self):
check_syntax_error(self, "async def f(/): pass")
check_syntax_error(self, "async def f(*, a, /): pass")
check_syntax_error(self, "async def f(*, /, a): pass")
- check_syntax_error(self, "async def f(a, /, a): pass", "duplicate
argument 'a' in function definition")
- check_syntax_error(self, "async def f(a, /, *, a): pass", "duplicate
argument 'a' in function definition")
+ check_syntax_error(self, "async def f(a, /, a): pass", "duplicate
parameter 'a' in function definition")
+ check_syntax_error(self, "async def f(a, /, *, a): pass", "duplicate
parameter 'a' in function definition")
check_syntax_error(self, "async def f(a, b/2, c): pass")
check_syntax_error(self, "async def f(a, /, c, /): pass")
check_syntax_error(self, "async def f(a, /, c, /, d): pass")
@@ -247,8 +247,8 @@ def test_invalid_syntax_lambda(self):
check_syntax_error(self, "lambda /: None")
check_syntax_error(self, "lambda *, a, /: None")
check_syntax_error(self, "lambda *, /, a: None")
- check_syntax_error(self, "lambda a, /, a: None", "duplicate argument
'a' in function definition")
- check_syntax_error(self, "lambda a, /, *, a: None", "duplicate
argument 'a' in function definition")
+ check_syntax_error(self, "lambda a, /, a: None", "duplicate parameter
'a' in function definition")
+ check_syntax_error(self, "lambda a, /, *, a: None", "duplicate
parameter 'a' in function definition")
check_syntax_error(self, "lambda a, /, b, /: None")
check_syntax_error(self, "lambda a, /, b, /, c: None")
check_syntax_error(self, "lambda a, /, b, /, c, *, d: None")
diff --git a/Lib/test/test_pyrepl/test_interact.py
b/Lib/test/test_pyrepl/test_interact.py
index a20719033fc9b7..8c0eeab6dcae96 100644
--- a/Lib/test/test_pyrepl/test_interact.py
+++ b/Lib/test/test_pyrepl/test_interact.py
@@ -113,7 +113,7 @@ def test_runsource_show_syntax_error_location(self):
r = """
def f(x, x): ...
^
-SyntaxError: duplicate argument 'x' in function definition"""
+SyntaxError: duplicate parameter 'x' in function definition"""
self.assertIn(r, f.getvalue())
def test_runsource_shows_syntax_error_for_failed_compilation(self):
diff --git a/Lib/test/test_repl.py b/Lib/test/test_repl.py
index 27f16f1ba96566..f4a4634fc62f8a 100644
--- a/Lib/test/test_repl.py
+++ b/Lib/test/test_repl.py
@@ -197,7 +197,7 @@ def test_runsource_show_syntax_error_location(self):
expected_lines = [
' def f(x, x): ...',
' ^',
- "SyntaxError: duplicate argument 'x' in function definition"
+ "SyntaxError: duplicate parameter 'x' in function definition"
]
self.assertEqual(output.splitlines()[4:-1], expected_lines)
diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 0ee17849e28121..0eccf03a1a96e3 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -419,7 +419,7 @@
>>> def foo(/,a,b=,c):
... pass
Traceback (most recent call last):
-SyntaxError: at least one argument must precede /
+SyntaxError: at least one parameter must precede /
>>> def foo(a,/,/,b,c):
... pass
@@ -454,67 +454,67 @@
>>> def foo(a,*b=3,c):
... pass
Traceback (most recent call last):
-SyntaxError: var-positional argument cannot have default value
+SyntaxError: var-positional parameter cannot have default value
>>> def foo(a,*b: int=,c):
... pass
Traceback (most recent call last):
-SyntaxError: var-positional argument cannot have default value
+SyntaxError: var-positional parameter cannot have default value
>>> def foo(a,**b=3):
... pass
Traceback (most recent call last):
-SyntaxError: var-keyword argument cannot have default value
+SyntaxError: var-keyword parameter cannot have default value
>>> def foo(a,**b: int=3):
... pass
Traceback (most recent call last):
-SyntaxError: var-keyword argument cannot have default value
+SyntaxError: var-keyword parameter cannot have default value
>>> def foo(a,*a, b, **c, d):
... pass
Traceback (most recent call last):
-SyntaxError: arguments cannot follow var-keyword argument
+SyntaxError: parameters cannot follow var-keyword parameter
>>> def foo(a,*a, b, **c, d=4):
... pass
Traceback (most recent call last):
-SyntaxError: arguments cannot follow var-keyword argument
+SyntaxError: parameters cannot follow var-keyword parameter
>>> def foo(a,*a, b, **c, *d):
... pass
Traceback (most recent call last):
-SyntaxError: arguments cannot follow var-keyword argument
+SyntaxError: parameters cannot follow var-keyword parameter
>>> def foo(a,*a, b, **c, **d):
... pass
Traceback (most recent call last):
-SyntaxError: arguments cannot follow var-keyword argument
+SyntaxError: parameters cannot follow var-keyword parameter
>>> def foo(a=1,/,**b,/,c):
... pass
Traceback (most recent call last):
-SyntaxError: arguments cannot follow var-keyword argument
+SyntaxError: parameters cannot follow var-keyword parameter
>>> def foo(*b,*d):
... pass
Traceback (most recent call last):
-SyntaxError: * argument may appear only once
+SyntaxError: * may appear only once
>>> def foo(a,*b,c,*d,*e,c):
... pass
Traceback (most recent call last):
-SyntaxError: * argument may appear only once
+SyntaxError: * may appear only once
>>> def foo(a,b,/,c,*b,c,*d,*e,c):
... pass
Traceback (most recent call last):
-SyntaxError: * argument may appear only once
+SyntaxError: * may appear only once
>>> def foo(a,b,/,c,*b,c,*d,**e):
... pass
Traceback (most recent call last):
-SyntaxError: * argument may appear only once
+SyntaxError: * may appear only once
>>> def foo(a=1,/*,b,c):
... pass
@@ -538,7 +538,7 @@
>>> lambda /,a,b,c: None
Traceback (most recent call last):
-SyntaxError: at least one argument must precede /
+SyntaxError: at least one parameter must precede /
>>> lambda a,/,/,b,c: None
Traceback (most recent call last):
@@ -570,47 +570,47 @@
>>> lambda a,*b=3,c: None
Traceback (most recent call last):
-SyntaxError: var-positional argument cannot have default value
+SyntaxError: var-positional parameter cannot have default value
>>> lambda a,**b=3: None
Traceback (most recent call last):
-SyntaxError: var-keyword argument cannot have default value
+SyntaxError: var-keyword parameter cannot have default value
>>> lambda a, *a, b, **c, d: None
Traceback (most recent call last):
-SyntaxError: arguments cannot follow var-keyword argument
+SyntaxError: parameters cannot follow var-keyword parameter
>>> lambda a,*a, b, **c, d=4: None
Traceback (most recent call last):
-SyntaxError: arguments cannot follow var-keyword argument
+SyntaxError: parameters cannot follow var-keyword parameter
>>> lambda a,*a, b, **c, *d: None
Traceback (most recent call last):
-SyntaxError: arguments cannot follow var-keyword argument
+SyntaxError: parameters cannot follow var-keyword parameter
>>> lambda a,*a, b, **c, **d: None
Traceback (most recent call last):
-SyntaxError: arguments cannot follow var-keyword argument
+SyntaxError: parameters cannot follow var-keyword parameter
>>> lambda a=1,/,**b,/,c: None
Traceback (most recent call last):
-SyntaxError: arguments cannot follow var-keyword argument
+SyntaxError: parameters cannot follow var-keyword parameter
>>> lambda *b,*d: None
Traceback (most recent call last):
-SyntaxError: * argument may appear only once
+SyntaxError: * may appear only once
>>> lambda a,*b,c,*d,*e,c: None
Traceback (most recent call last):
-SyntaxError: * argument may appear only once
+SyntaxError: * may appear only once
>>> lambda a,b,/,c,*b,c,*d,*e,c: None
Traceback (most recent call last):
-SyntaxError: * argument may appear only once
+SyntaxError: * may appear only once
>>> lambda a,b,/,c,*b,c,*d,**e: None
Traceback (most recent call last):
-SyntaxError: * argument may appear only once
+SyntaxError: * may appear only once
>>> lambda a=1,d=,c: None
Traceback (most recent call last):
@@ -1304,7 +1304,7 @@
Traceback (most recent call last):
SyntaxError: expected '('
-Parenthesized arguments in function definitions
+Parenthesized parameters in function definitions
>>> def f(x, (y, z), w):
... pass
@@ -2178,7 +2178,7 @@
>>> with (lambda *:0): pass
Traceback (most recent call last):
- SyntaxError: named arguments must follow bare *
+ SyntaxError: named parameters must follow bare *
Corner-cases that used to crash:
diff --git
a/Misc/NEWS.d/next/Core_and_Builtins/2025-04-04-16-41-00.gh-issue-133379.asdjhjdf.rst
b/Misc/NEWS.d/next/Core_and_Builtins/2025-04-04-16-41-00.gh-issue-133379.asdjhjdf.rst
new file mode 100644
index 00000000000000..cf2e1e4eaff779
--- /dev/null
+++
b/Misc/NEWS.d/next/Core_and_Builtins/2025-04-04-16-41-00.gh-issue-133379.asdjhjdf.rst
@@ -0,0 +1 @@
+Correct usage of *arguments* in error messages.
diff --git a/Parser/parser.c b/Parser/parser.c
index 509fac7df6e371..b48b1b20ee4d8e 100644
--- a/Parser/parser.c
+++ b/Parser/parser.c
@@ -22190,7 +22190,7 @@ invalid_parameters_rule(Parser *p)
)
{
D(fprintf(stderr, "%*c+ invalid_parameters[%d-%d]: %s
succeeded!\n", p->level, ' ', _mark, p->mark, "\"/\" ','"));
- _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "at least one
argument must precede /" );
+ _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "at least one
parameter must precede /" );
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
p->level--;
@@ -22456,7 +22456,7 @@ invalid_star_etc_rule(Parser *p)
)
{
D(fprintf(stderr, "%*c+ invalid_star_etc[%d-%d]: %s succeeded!\n",
p->level, ' ', _mark, p->mark, "'*' (')' | ',' (')' | '**'))"));
- _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "named arguments
must follow bare *" );
+ _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "named parameters
must follow bare *" );
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
p->level--;
@@ -22516,7 +22516,7 @@ invalid_star_etc_rule(Parser *p)
)
{
D(fprintf(stderr, "%*c+ invalid_star_etc[%d-%d]: %s succeeded!\n",
p->level, ' ', _mark, p->mark, "'*' param '='"));
- _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "var-positional
argument cannot have default value" );
+ _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "var-positional
parameter cannot have default value" );
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
p->level--;
@@ -22552,7 +22552,7 @@ invalid_star_etc_rule(Parser *p)
)
{
D(fprintf(stderr, "%*c+ invalid_star_etc[%d-%d]: %s succeeded!\n",
p->level, ' ', _mark, p->mark, "'*' (param_no_default | ',')
param_maybe_default* '*' (param_no_default | ',')"));
- _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "* argument may
appear only once" );
+ _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "* may appear only
once" );
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
p->level--;
@@ -22601,7 +22601,7 @@ invalid_kwds_rule(Parser *p)
)
{
D(fprintf(stderr, "%*c+ invalid_kwds[%d-%d]: %s succeeded!\n",
p->level, ' ', _mark, p->mark, "'**' param '='"));
- _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "var-keyword
argument cannot have default value" );
+ _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "var-keyword
parameter cannot have default value" );
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
p->level--;
@@ -22634,7 +22634,7 @@ invalid_kwds_rule(Parser *p)
)
{
D(fprintf(stderr, "%*c+ invalid_kwds[%d-%d]: %s succeeded!\n",
p->level, ' ', _mark, p->mark, "'**' param ',' param"));
- _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "arguments cannot
follow var-keyword argument" );
+ _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "parameters cannot
follow var-keyword parameter" );
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
p->level--;
@@ -22667,7 +22667,7 @@ invalid_kwds_rule(Parser *p)
)
{
D(fprintf(stderr, "%*c+ invalid_kwds[%d-%d]: %s succeeded!\n",
p->level, ' ', _mark, p->mark, "'**' param ',' ('*' | '**' | '/')"));
- _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "arguments cannot
follow var-keyword argument" );
+ _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "parameters cannot
follow var-keyword parameter" );
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
p->level--;
@@ -22781,7 +22781,7 @@ invalid_lambda_parameters_rule(Parser *p)
)
{
D(fprintf(stderr, "%*c+ invalid_lambda_parameters[%d-%d]: %s
succeeded!\n", p->level, ' ', _mark, p->mark, "\"/\" ','"));
- _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "at least one
argument must precede /" );
+ _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "at least one
parameter must precede /" );
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
p->level--;
@@ -23065,7 +23065,7 @@ invalid_lambda_star_etc_rule(Parser *p)
)
{
D(fprintf(stderr, "%*c+ invalid_lambda_star_etc[%d-%d]: %s
succeeded!\n", p->level, ' ', _mark, p->mark, "'*' (':' | ',' (':' | '**'))"));
- _res = RAISE_SYNTAX_ERROR ( "named arguments must follow bare *" );
+ _res = RAISE_SYNTAX_ERROR ( "named parameters must follow bare *"
);
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
p->level--;
@@ -23095,7 +23095,7 @@ invalid_lambda_star_etc_rule(Parser *p)
)
{
D(fprintf(stderr, "%*c+ invalid_lambda_star_etc[%d-%d]: %s
succeeded!\n", p->level, ' ', _mark, p->mark, "'*' lambda_param '='"));
- _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "var-positional
argument cannot have default value" );
+ _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "var-positional
parameter cannot have default value" );
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
p->level--;
@@ -23131,7 +23131,7 @@ invalid_lambda_star_etc_rule(Parser *p)
)
{
D(fprintf(stderr, "%*c+ invalid_lambda_star_etc[%d-%d]: %s
succeeded!\n", p->level, ' ', _mark, p->mark, "'*' (lambda_param_no_default |
',') lambda_param_maybe_default* '*' (lambda_param_no_default | ',')"));
- _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "* argument may
appear only once" );
+ _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "* may appear only
once" );
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
p->level--;
@@ -23183,7 +23183,7 @@ invalid_lambda_kwds_rule(Parser *p)
)
{
D(fprintf(stderr, "%*c+ invalid_lambda_kwds[%d-%d]: %s
succeeded!\n", p->level, ' ', _mark, p->mark, "'**' lambda_param '='"));
- _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "var-keyword
argument cannot have default value" );
+ _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "var-keyword
parameter cannot have default value" );
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
p->level--;
@@ -23216,7 +23216,7 @@ invalid_lambda_kwds_rule(Parser *p)
)
{
D(fprintf(stderr, "%*c+ invalid_lambda_kwds[%d-%d]: %s
succeeded!\n", p->level, ' ', _mark, p->mark, "'**' lambda_param ','
lambda_param"));
- _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "arguments cannot
follow var-keyword argument" );
+ _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "parameters cannot
follow var-keyword parameter" );
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
p->level--;
@@ -23249,7 +23249,7 @@ invalid_lambda_kwds_rule(Parser *p)
)
{
D(fprintf(stderr, "%*c+ invalid_lambda_kwds[%d-%d]: %s
succeeded!\n", p->level, ' ', _mark, p->mark, "'**' lambda_param ',' ('*' |
'**' | '/')"));
- _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "arguments cannot
follow var-keyword argument" );
+ _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "parameters cannot
follow var-keyword parameter" );
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
p->level--;
diff --git a/Python/symtable.c b/Python/symtable.c
index f633e281019720..a3d0fff80d24a1 100644
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -380,8 +380,8 @@ static void dump_symtable(PySTEntryObject* ste)
}
#endif
-#define DUPLICATE_ARGUMENT \
-"duplicate argument '%U' in function definition"
+#define DUPLICATE_PARAMETER \
+"duplicate parameter '%U' in function definition"
static struct symtable *
symtable_new(void)
@@ -1494,7 +1494,7 @@ symtable_add_def_helper(struct symtable *st, PyObject
*name, int flag, struct _s
}
if ((flag & DEF_PARAM) && (val & DEF_PARAM)) {
/* Is it better to use 'mangled' or 'name' here? */
- PyErr_Format(PyExc_SyntaxError, DUPLICATE_ARGUMENT, name);
+ PyErr_Format(PyExc_SyntaxError, DUPLICATE_PARAMETER, name);
SET_ERROR_LOCATION(st->st_filename, loc);
goto error;
}
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
