Mailman 3 August 2021 - Python-checkins

doc: "Mac OS " -> "macOS" (GH-27534)
by ambv Aug. 2, 2021

Aug. 2, 2021

https://github.com/python/cpython/commit/1342248f3a2b321b7b00867f47c92ba654… commit: 1342248f3a2b321b7b00867f47c92ba6549f9497 branch: main author: partev <petrosyan(a)gmail.com> committer: ambv <lukasz(a)langa.pl> date: 2021-08-02T11:39:56+02:00 summary: doc: "Mac OS " -> "macOS" (GH-27534) files: M Doc/library/platform.rst diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst index be86e568c180b..bb9fc45df233b 100644 --- a/Doc/library/platform.rst +++ b/Doc/library/platform.rst @@ -42,7 +42,7 @@ Cross Platform .. note:: - On Mac OS X (and perhaps other platforms), executable files may be + On macOS (and perhaps other platforms), executable files may be universal files containing multiple architectures. To get at the "64-bitness" of the current interpreter, it is more

1 0

bpo-44781: make distutils test suppress deprecation warning from import distutils (GH-27485)
by ambv Aug. 2, 2021

Aug. 2, 2021

https://github.com/python/cpython/commit/a9134fa2ffb7e4684c980325dd5444afca… commit: a9134fa2ffb7e4684c980325dd5444afca596586 branch: main author: Irit Katriel <1055913+iritkatriel(a)users.noreply.github.com> committer: ambv <lukasz(a)langa.pl> date: 2021-08-02T11:34:55+02:00 summary: bpo-44781: make distutils test suppress deprecation warning from import distutils (GH-27485) files: M Lib/distutils/tests/test_bdist.py diff --git a/Lib/distutils/tests/test_bdist.py b/Lib/distutils/tests/test_bdist.py index 09ad076799b420..55fa3930dd92f2 100644 --- a/Lib/distutils/tests/test_bdist.py +++ b/Lib/distutils/tests/test_bdist.py @@ -3,8 +3,11 @@ import unittest from test.support import run_unittest -from distutils.command.bdist import bdist -from distutils.tests import support +import warnings +with warnings.catch_warnings(): + warnings.simplefilter('ignore', DeprecationWarning) + from distutils.command.bdist import bdist + from distutils.tests import support class BuildTestCase(support.TempdirManager,

1 0

bpo-44793: Fix checking the number of arguments when subscribe a generic type with ParamSpec parameter. (GH-27515)
by miss-islington Aug. 2, 2021

Aug. 2, 2021

https://github.com/python/cpython/commit/c8db292012dd84aab81eb3ed9146709696… commit: c8db292012dd84aab81eb3ed9146709696a3d290 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-08-02T00:08:24-07:00 summary: bpo-44793: Fix checking the number of arguments when subscribe a generic type with ParamSpec parameter. (GH-27515) For example Callable[P, T][[int], str, float] will now raise an error. Use also term "arguments" instead of "parameters" in error message for too few/many arguments. (cherry picked from commit f92b9133ef67e77605cbd315b6b6c81036ce110e) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: A Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst M Lib/test/test_typing.py M Lib/typing.py diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index 029a1586a02a1..3d9a347dcb707 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -620,8 +620,6 @@ def test_consistency(self): self.assertEqual(c1.__args__, c2.__args__) self.assertEqual(hash(c1.__args__), hash(c2.__args__)) - test_errors = skip("known bug #44793")(BaseCallableTests.test_errors) - class CollectionsCallableTests(BaseCallableTests, BaseTestCase): Callable = collections.abc.Callable @@ -4548,6 +4546,10 @@ class X(Generic[T, P]): G1 = X[int, P_2] self.assertEqual(G1.__args__, (int, P_2)) self.assertEqual(G1.__parameters__, (P_2,)) + with self.assertRaisesRegex(TypeError, "few arguments for"): + X[int] + with self.assertRaisesRegex(TypeError, "many arguments for"): + X[int, P_2, str] G2 = X[int, Concatenate[int, P_2]] self.assertEqual(G2.__args__, (int, Concatenate[int, P_2])) diff --git a/Lib/typing.py b/Lib/typing.py index bcb22b2d178c3..e492bd2ee916b 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -220,7 +220,7 @@ def _check_generic(cls, parameters, elen): raise TypeError(f"{cls} is not a generic class") alen = len(parameters) if alen != elen: - raise TypeError(f"Too {'many' if alen > elen else 'few'} parameters for {cls};" + raise TypeError(f"Too {'many' if alen > elen else 'few'} arguments for {cls};" f" actual {alen}, expected {elen}") def _prepare_paramspec_params(cls, params): @@ -231,6 +231,7 @@ def _prepare_paramspec_params(cls, params): if len(cls.__parameters__) == 1 and len(params) > 1: return (params,) else: + _check_generic(cls, params, len(cls.__parameters__)) _params = [] # Convert lists to tuples to help other libraries cache the results. for p, tvar in zip(params, cls.__parameters__): @@ -1020,10 +1021,11 @@ def __getitem__(self, params): if not isinstance(params, tuple): params = (params,) params = tuple(_type_convert(p) for p in params) - if self._paramspec_tvars: - if any(isinstance(t, ParamSpec) for t in self.__parameters__): - params = _prepare_paramspec_params(self, params) - _check_generic(self, params, len(self.__parameters__)) + if (self._paramspec_tvars + and any(isinstance(t, ParamSpec) for t in self.__parameters__)): + params = _prepare_paramspec_params(self, params) + else: + _check_generic(self, params, len(self.__parameters__)) subst = dict(zip(self.__parameters__, params)) new_args = [] @@ -1290,7 +1292,8 @@ def __class_getitem__(cls, params): # Subscripting a regular Generic subclass. if any(isinstance(t, ParamSpec) for t in cls.__parameters__): params = _prepare_paramspec_params(cls, params) - _check_generic(cls, params, len(cls.__parameters__)) + else: + _check_generic(cls, params, len(cls.__parameters__)) return _GenericAlias(cls, params, _typevar_types=(TypeVar, ParamSpec), _paramspec_tvars=True) diff --git a/Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst b/Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst new file mode 100644 index 0000000000000..1d94d67615a47 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst @@ -0,0 +1,2 @@ +Fix checking the number of arguments when subscribe a generic type with +``ParamSpec`` parameter.

1 0

bpo-44793: Fix checking the number of arguments when subscribe a generic type with ParamSpec parameter. (GH-27515)
by serhiy-storchaka Aug. 2, 2021

Aug. 2, 2021

https://github.com/python/cpython/commit/f92b9133ef67e77605cbd315b6b6c81036… commit: f92b9133ef67e77605cbd315b6b6c81036ce110e branch: main author: Serhiy Storchaka <storchaka(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2021-08-02T09:17:46+03:00 summary: bpo-44793: Fix checking the number of arguments when subscribe a generic type with ParamSpec parameter. (GH-27515) For example Callable[P, T][[int], str, float] will now raise an error. Use also term "arguments" instead of "parameters" in error message for too few/many arguments. files: A Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst M Lib/test/test_typing.py M Lib/typing.py diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index fbdf634c5c3be..6cd83a1586a13 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -626,8 +626,6 @@ def test_consistency(self): self.assertEqual(c1.__args__, c2.__args__) self.assertEqual(hash(c1.__args__), hash(c2.__args__)) - test_errors = skip("known bug #44793")(BaseCallableTests.test_errors) - class CollectionsCallableTests(BaseCallableTests, BaseTestCase): Callable = collections.abc.Callable @@ -4588,6 +4586,10 @@ class X(Generic[T, P]): G1 = X[int, P_2] self.assertEqual(G1.__args__, (int, P_2)) self.assertEqual(G1.__parameters__, (P_2,)) + with self.assertRaisesRegex(TypeError, "few arguments for"): + X[int] + with self.assertRaisesRegex(TypeError, "many arguments for"): + X[int, P_2, str] G2 = X[int, Concatenate[int, P_2]] self.assertEqual(G2.__args__, (int, Concatenate[int, P_2])) diff --git a/Lib/typing.py b/Lib/typing.py index 702bb647269d0..16ad5ce7c2d04 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -228,7 +228,7 @@ def _check_generic(cls, parameters, elen): raise TypeError(f"{cls} is not a generic class") alen = len(parameters) if alen != elen: - raise TypeError(f"Too {'many' if alen > elen else 'few'} parameters for {cls};" + raise TypeError(f"Too {'many' if alen > elen else 'few'} arguments for {cls};" f" actual {alen}, expected {elen}") def _prepare_paramspec_params(cls, params): @@ -239,6 +239,7 @@ def _prepare_paramspec_params(cls, params): if len(cls.__parameters__) == 1 and len(params) > 1: return (params,) else: + _check_generic(cls, params, len(cls.__parameters__)) _params = [] # Convert lists to tuples to help other libraries cache the results. for p, tvar in zip(params, cls.__parameters__): @@ -1022,10 +1023,11 @@ def __getitem__(self, params): if not isinstance(params, tuple): params = (params,) params = tuple(_type_convert(p) for p in params) - if self._paramspec_tvars: - if any(isinstance(t, ParamSpec) for t in self.__parameters__): - params = _prepare_paramspec_params(self, params) - _check_generic(self, params, len(self.__parameters__)) + if (self._paramspec_tvars + and any(isinstance(t, ParamSpec) for t in self.__parameters__)): + params = _prepare_paramspec_params(self, params) + else: + _check_generic(self, params, len(self.__parameters__)) subst = dict(zip(self.__parameters__, params)) new_args = [] @@ -1292,7 +1294,8 @@ def __class_getitem__(cls, params): # Subscripting a regular Generic subclass. if any(isinstance(t, ParamSpec) for t in cls.__parameters__): params = _prepare_paramspec_params(cls, params) - _check_generic(cls, params, len(cls.__parameters__)) + else: + _check_generic(cls, params, len(cls.__parameters__)) return _GenericAlias(cls, params, _typevar_types=(TypeVar, ParamSpec), _paramspec_tvars=True) diff --git a/Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst b/Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst new file mode 100644 index 0000000000000..1d94d67615a47 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-07-31-20-28-20.bpo-44793.woaQSg.rst @@ -0,0 +1,2 @@ +Fix checking the number of arguments when subscribe a generic type with +``ParamSpec`` parameter.

1 0

Remove beta release note from macOS installer displays (GH-27531)
by ned-deily Aug. 1, 2021

Aug. 1, 2021

https://github.com/python/cpython/commit/b192fb3f6a99c33f664e27395ffc0cef4d… commit: b192fb3f6a99c33f664e27395ffc0cef4dbc8d29 branch: 3.10 author: Ned Deily <nad(a)python.org> committer: ned-deily <nad(a)python.org> date: 2021-08-01T17:35:53-04:00 summary: Remove beta release note from macOS installer displays (GH-27531) files: M Mac/BuildScript/resources/ReadMe.rtf M Mac/BuildScript/resources/Welcome.rtf diff --git a/Mac/BuildScript/resources/ReadMe.rtf b/Mac/BuildScript/resources/ReadMe.rtf index a6bfeb9f164ea..7934dd1a4bea5 100644 --- a/Mac/BuildScript/resources/ReadMe.rtf +++ b/Mac/BuildScript/resources/ReadMe.rtf @@ -8,12 +8,6 @@ \f0\fs24 \cf0 This package will install Python $FULL_VERSION for macOS $MACOSX_DEPLOYMENT_TARGET for the following architecture(s): $ARCHITECTURES.\ \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0 - -\f1\b \cf0 NOTE: -\f0\b0 This is a beta test preview of Python 3.10.0, the next feature release of Python 3. It is not intended for production use.\ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 -\cf0 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 \f1\b \cf0 \ul \ulc0 Certificate verification and OpenSSL\ diff --git a/Mac/BuildScript/resources/Welcome.rtf b/Mac/BuildScript/resources/Welcome.rtf index c65119b7fa2e2..57ffdb53d6f24 100644 --- a/Mac/BuildScript/resources/Welcome.rtf +++ b/Mac/BuildScript/resources/Welcome.rtf @@ -3,7 +3,7 @@ } {\colortbl;\red255\green255\blue255;} {\*\expandedcolortbl;;} -\paperw11905\paperh16837\margl1440\margr1440\vieww12200\viewh10880\viewkind0 +\paperw11900\paperh16840\margl1440\margr1440\vieww12200\viewh10880\viewkind0 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0 \f0\fs24 \cf0 This package will install @@ -23,8 +23,4 @@ At the end of this install, click on \f2 Install Certificates \f0 to install a set of current SSL root certificates.\ -\ - -\f1\b NOTE: -\f0\b0 This is a beta test preview of Python 3.10.0, the next feature release of Python 3. It is not intended for production use.\ } \ No newline at end of file

1 0

bpo-44784: Apply changes from importlib_metadata 4.6.3 (GH-27508) (#27510)
by jaraco Aug. 1, 2021

Aug. 1, 2021

https://github.com/python/cpython/commit/21d5897982698a461215203ab51f56ad05… commit: 21d5897982698a461215203ab51f56ad05648001 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: jaraco <jaraco(a)jaraco.com> date: 2021-07-31T23:01:38-04:00 summary: bpo-44784: Apply changes from importlib_metadata 4.6.3 (GH-27508) (#27510) Addressing issues with tests under error on warnings. Automerge-Triggered-By: GH:jaraco (cherry picked from commit 1cf8424a62db38a041d421a46618e025bbb87f89) Co-authored-by: Jason R. Coombs <jaraco(a)jaraco.com> Co-authored-by: Jason R. Coombs <jaraco(a)jaraco.com> files: A Misc/NEWS.d/next/Library/2021-07-31-08-45-31.bpo-44784.fIMIDS.rst M Lib/test/test_importlib/test_metadata_api.py diff --git a/Lib/test/test_importlib/test_metadata_api.py b/Lib/test/test_importlib/test_metadata_api.py index 2bfc44b18eedb4..dc9c234d15b785 100644 --- a/Lib/test/test_importlib/test_metadata_api.py +++ b/Lib/test/test_importlib/test_metadata_api.py @@ -3,6 +3,7 @@ import unittest import warnings import importlib +import contextlib from . import fixtures from importlib.metadata import ( @@ -17,6 +18,13 @@ ) +(a)contextlib.contextmanager +def suppress_known_deprecation(): + with warnings.catch_warnings(record=True) as ctx: + warnings.simplefilter('default') + yield ctx + + class APITests( fixtures.EggInfoPkg, fixtures.DistInfoPkg, @@ -118,8 +126,7 @@ def test_entry_points_dict_construction(self): # Prior versions of entry_points() returned simple lists and # allowed casting those lists into maps by name using ``dict()``. # Capture this now deprecated use-case. - with warnings.catch_warnings(record=True) as caught: - warnings.filterwarnings("default", category=DeprecationWarning) + with suppress_known_deprecation() as caught: eps = dict(entry_points(group='entries')) assert 'main' in eps @@ -138,8 +145,7 @@ def test_entry_points_by_index(self): See python/importlib_metadata#300 and bpo-44246. """ eps = distribution('distinfo-pkg').entry_points - with warnings.catch_warnings(record=True) as caught: - warnings.filterwarnings("default", category=DeprecationWarning) + with suppress_known_deprecation() as caught: eps[0] # check warning @@ -151,7 +157,7 @@ def test_entry_points_groups_getitem(self): # Prior versions of entry_points() returned a dict. Ensure # that callers using '.__getitem__()' are supported but warned to # migrate. - with warnings.catch_warnings(record=True): + with suppress_known_deprecation(): entry_points()['entries'] == entry_points(group='entries') with self.assertRaises(KeyError): @@ -161,7 +167,7 @@ def test_entry_points_groups_get(self): # Prior versions of entry_points() returned a dict. Ensure # that callers using '.get()' are supported but warned to # migrate. - with warnings.catch_warnings(record=True): + with suppress_known_deprecation(): entry_points().get('missing', 'default') == 'default' entry_points().get('entries', 'default') == entry_points()['entries'] entry_points().get('missing', ()) == () diff --git a/Misc/NEWS.d/next/Library/2021-07-31-08-45-31.bpo-44784.fIMIDS.rst b/Misc/NEWS.d/next/Library/2021-07-31-08-45-31.bpo-44784.fIMIDS.rst new file mode 100644 index 00000000000000..6ad10ef3f59805 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-07-31-08-45-31.bpo-44784.fIMIDS.rst @@ -0,0 +1,2 @@ +In importlib.metadata tests, override warnings behavior under expected +DeprecationWarnings (importlib_metadata 4.6.3).

1 0

bpo-34013: Don't consider a grouped expression when reporting legacy print syntax errors (GH-27521)
by miss-islington Aug. 1, 2021

Aug. 1, 2021

https://github.com/python/cpython/commit/35035bc35a9cb8617ab9fe9aac38aaf67c… commit: 35035bc35a9cb8617ab9fe9aac38aaf67c926aef branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-07-31T18:31:44-07:00 summary: bpo-34013: Don't consider a grouped expression when reporting legacy print syntax errors (GH-27521) (cherry picked from commit 208a7e957b812ad3b3733791845447677a704f3e) Co-authored-by: Pablo Galindo Salgado <Pablogsal(a)gmail.com> files: M Grammar/python.gram M Lib/test/test_exceptions.py M Parser/parser.c diff --git a/Grammar/python.gram b/Grammar/python.gram index 70f2de8b9dece5..057bcb641a6666 100644 --- a/Grammar/python.gram +++ b/Grammar/python.gram @@ -849,7 +849,7 @@ expression_without_invalid[expr_ty]: | disjunction | lambdef invalid_legacy_expression: - | a=NAME b=star_expressions { + | a=NAME !'(' b=star_expressions { _PyPegen_check_legacy_stmt(p, a) ? RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "Missing parentheses in call to '%U'. Did you mean %U(...)?", a->v.Name.id, a->v.Name.id) : NULL} diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py index 8ffebebaeb83d1..339801ebaeaef2 100644 --- a/Lib/test/test_exceptions.py +++ b/Lib/test/test_exceptions.py @@ -182,6 +182,15 @@ def ckmsg(src, msg, exception=SyntaxError): s = 'exec f(a+b,c)' ckmsg(s, "Missing parentheses in call to 'exec'. Did you mean exec(...)?") + # Check that we don't incorrectly identify '(...)' as an expression to the right + # of 'print' + + s = 'print (a+b,c) $ 42' + ckmsg(s, "invalid syntax") + + s = 'exec (a+b,c) $ 42' + ckmsg(s, "invalid syntax") + # should not apply to subclasses, see issue #31161 s = '''if True:\nprint "No indent"''' ckmsg(s, "expected an indented block after 'if' statement on line 1", IndentationError) diff --git a/Parser/parser.c b/Parser/parser.c index cda5c635276dde..c4a4eb651b3e78 100644 --- a/Parser/parser.c +++ b/Parser/parser.c @@ -18180,7 +18180,7 @@ expression_without_invalid_rule(Parser *p) return _res; } -// invalid_legacy_expression: NAME star_expressions +// invalid_legacy_expression: NAME !'(' star_expressions static void * invalid_legacy_expression_rule(Parser *p) { @@ -18191,21 +18191,23 @@ invalid_legacy_expression_rule(Parser *p) } void * _res = NULL; int _mark = p->mark; - { // NAME star_expressions + { // NAME !'(' star_expressions if (p->error_indicator) { D(p->level--); return NULL; } - D(fprintf(stderr, "%*c> invalid_legacy_expression[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "NAME star_expressions")); + D(fprintf(stderr, "%*c> invalid_legacy_expression[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "NAME !'(' star_expressions")); expr_ty a; expr_ty b; if ( (a = _PyPegen_name_token(p)) // NAME && + _PyPegen_lookahead_with_int(0, _PyPegen_expect_token, p, 7) // token='(' + && (b = star_expressions_rule(p)) // star_expressions ) { - D(fprintf(stderr, "%*c+ invalid_legacy_expression[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "NAME star_expressions")); + D(fprintf(stderr, "%*c+ invalid_legacy_expression[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "NAME !'(' star_expressions")); _res = _PyPegen_check_legacy_stmt ( p , a ) ? RAISE_SYNTAX_ERROR_KNOWN_RANGE ( a , b , "Missing parentheses in call to '%U'. Did you mean %U(...)?" , a -> v . Name . id , a -> v . Name . id ) : NULL; if (_res == NULL && PyErr_Occurred()) { p->error_indicator = 1; @@ -18216,7 +18218,7 @@ invalid_legacy_expression_rule(Parser *p) } p->mark = _mark; D(fprintf(stderr, "%*c%s invalid_legacy_expression[%d-%d]: %s failed!\n", p->level, ' ', - p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "NAME star_expressions")); + p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "NAME !'(' star_expressions")); } _res = NULL; done:

1 0

bpo-34013: Don't consider a grouped expression when reporting legacy print syntax errors (GH-27521)
by pablogsal Aug. 1, 2021

Aug. 1, 2021

https://github.com/python/cpython/commit/208a7e957b812ad3b3733791845447677a… commit: 208a7e957b812ad3b3733791845447677a704f3e branch: main author: Pablo Galindo Salgado <Pablogsal(a)gmail.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-08-01T02:10:50+01:00 summary: bpo-34013: Don't consider a grouped expression when reporting legacy print syntax errors (GH-27521) files: M Grammar/python.gram M Lib/test/test_exceptions.py M Parser/parser.c diff --git a/Grammar/python.gram b/Grammar/python.gram index 278ddfb2d1a30..8a21056d2a82b 100644 --- a/Grammar/python.gram +++ b/Grammar/python.gram @@ -1073,7 +1073,7 @@ expression_without_invalid[expr_ty]: | disjunction | lambdef invalid_legacy_expression: - | a=NAME b=star_expressions { + | a=NAME !'(' b=star_expressions { _PyPegen_check_legacy_stmt(p, a) ? RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "Missing parentheses in call to '%U'. Did you mean %U(...)?", a->v.Name.id, a->v.Name.id) : NULL} diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py index 8ea415f45a6d4..b280cfea435fd 100644 --- a/Lib/test/test_exceptions.py +++ b/Lib/test/test_exceptions.py @@ -182,6 +182,15 @@ def ckmsg(src, msg, exception=SyntaxError): s = 'exec f(a+b,c)' ckmsg(s, "Missing parentheses in call to 'exec'. Did you mean exec(...)?") + # Check that we don't incorrectly identify '(...)' as an expression to the right + # of 'print' + + s = 'print (a+b,c) $ 42' + ckmsg(s, "invalid syntax") + + s = 'exec (a+b,c) $ 42' + ckmsg(s, "invalid syntax") + # should not apply to subclasses, see issue #31161 s = '''if True:\nprint "No indent"''' ckmsg(s, "expected an indented block after 'if' statement on line 1", IndentationError) diff --git a/Parser/parser.c b/Parser/parser.c index c05fc31c2436e..7a106a437bc31 100644 --- a/Parser/parser.c +++ b/Parser/parser.c @@ -18158,7 +18158,7 @@ expression_without_invalid_rule(Parser *p) return _res; } -// invalid_legacy_expression: NAME star_expressions +// invalid_legacy_expression: NAME !'(' star_expressions static void * invalid_legacy_expression_rule(Parser *p) { @@ -18169,21 +18169,23 @@ invalid_legacy_expression_rule(Parser *p) } void * _res = NULL; int _mark = p->mark; - { // NAME star_expressions + { // NAME !'(' star_expressions if (p->error_indicator) { D(p->level--); return NULL; } - D(fprintf(stderr, "%*c> invalid_legacy_expression[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "NAME star_expressions")); + D(fprintf(stderr, "%*c> invalid_legacy_expression[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "NAME !'(' star_expressions")); expr_ty a; expr_ty b; if ( (a = _PyPegen_name_token(p)) // NAME && + _PyPegen_lookahead_with_int(0, _PyPegen_expect_token, p, 7) // token='(' + && (b = star_expressions_rule(p)) // star_expressions ) { - D(fprintf(stderr, "%*c+ invalid_legacy_expression[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "NAME star_expressions")); + D(fprintf(stderr, "%*c+ invalid_legacy_expression[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "NAME !'(' star_expressions")); _res = _PyPegen_check_legacy_stmt ( p , a ) ? RAISE_SYNTAX_ERROR_KNOWN_RANGE ( a , b , "Missing parentheses in call to '%U'. Did you mean %U(...)?" , a -> v . Name . id , a -> v . Name . id ) : NULL; if (_res == NULL && PyErr_Occurred()) { p->error_indicator = 1; @@ -18194,7 +18196,7 @@ invalid_legacy_expression_rule(Parser *p) } p->mark = _mark; D(fprintf(stderr, "%*c%s invalid_legacy_expression[%d-%d]: %s failed!\n", p->level, ' ', - p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "NAME star_expressions")); + p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "NAME !'(' star_expressions")); } _res = NULL; done:

1 0