Mailman 3 March 2022 - Python-checkins

bpo-27929: resolve names only for AF_INET/AF_INET6 with asyncio (GH-32131)
by asvetlov March 28, 2022

March 28, 2022

https://github.com/python/cpython/commit/5c30388f3c586ba2f33e349e22e5949cb9… commit: 5c30388f3c586ba2f33e349e22e5949cb92de621 branch: main author: Vincent Bernat <vincent(a)bernat.ch> committer: asvetlov <andrew.svetlov(a)gmail.com> date: 2022-03-29T00:50:26+03:00 summary: bpo-27929: resolve names only for AF_INET/AF_INET6 with asyncio (GH-32131) Co-authored-by: Andrew Svetlov <andrew.svetlov(a)gmail.com> files: A Misc/NEWS.d/next/Library/2022-03-28-13-35-50.bpo-27929.… [View More]

1 0

bpo-47129: Add more informative messages to f-string syntax errors (32127)
by ericvsmith March 28, 2022

March 28, 2022

https://github.com/python/cpython/commit/7b44ade018cfe6f54002a3cee43e8aa415… commit: 7b44ade018cfe6f54002a3cee43e8aa415d4d635 branch: main author: Maciej Górski <36813763+macgors(a)users.noreply.github.com> committer: ericvsmith <ericvsmith(a)users.noreply.github.com> date: 2022-03-28T17:08:36-04:00 summary: bpo-47129: Add more informative messages to f-string syntax errors (32127) * Add more informative messages to f-string syntax errors * 📜🤖 Added by blurb_it. * Fix … [View More]whitespaces * Change error message * Remove the 'else' statement (as sugested in review) Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot](a)users.noreply.github.com> files: A Misc/NEWS.d/next/Core and Builtins/2022-03-26-16-35-57.bpo-47129.hDg2Vt.rst M Lib/test/test_fstring.py M Parser/string_parser.c diff --git a/Lib/test/test_fstring.py b/Lib/test/test_fstring.py index 0c255c2af2217..0c3372f033551 100644 --- a/Lib/test/test_fstring.py +++ b/Lib/test/test_fstring.py @@ -628,16 +628,27 @@ def test_missing_expression(self): ["f'{}'", "f'{ }'" "f' {} '", - "f'{!r}'", - "f'{ !r}'", "f'{10:{ }}'", "f' { } '", # The Python parser ignores also the following # whitespace characters in additional to a space. "f'''{\t\f\r\n}'''", + ]) + + # Different error messeges are raised when a specfier ('!', ':' or '=') is used after an empty expression + self.assertAllRaise(SyntaxError, "f-string: expression required before '!'", + ["f'{!r}'", + "f'{ !r}'", + "f'{!}'", + "f'''{\t\f\r\n!a}'''", + + # Catch empty expression before the + # missing closing brace. + "f'{!'", + "f'{!s:'", - # Catch the empty expression before the + # Catch empty expression before the # invalid conversion. "f'{!x}'", "f'{ !xr}'", @@ -645,16 +656,23 @@ def test_missing_expression(self): "f'{!x:a}'", "f'{ !xr:}'", "f'{ !xr:a}'", + ]) - "f'{!}'", - "f'{:}'", - - # We find the empty expression before the - # missing closing brace. - "f'{!'", - "f'{!s:'", + self.assertAllRaise(SyntaxError, "f-string: expression required before ':'", + ["f'{:}'", + "f'{ :!}'", + "f'{:2}'", + "f'''{\t\f\r\n:a}'''", "f'{:'", - "f'{:x'", + ]) + + self.assertAllRaise(SyntaxError, "f-string: expression required before '='", + ["f'{=}'", + "f'{ =}'", + "f'{ =:}'", + "f'{ =!}'", + "f'''{\t\f\r\n=}'''", + "f'{='", ]) # Different error message is raised for other whitespace characters. diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-03-26-16-35-57.bpo-47129.hDg2Vt.rst b/Misc/NEWS.d/next/Core and Builtins/2022-03-26-16-35-57.bpo-47129.hDg2Vt.rst new file mode 100644 index 0000000000000..1627aba41d636 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2022-03-26-16-35-57.bpo-47129.hDg2Vt.rst @@ -0,0 +1 @@ +Improve error messages in f-string syntax errors concerning empty expressions. diff --git a/Parser/string_parser.c b/Parser/string_parser.c index fae2a3648cf9f..65ddd46874b20 100644 --- a/Parser/string_parser.c +++ b/Parser/string_parser.c @@ -357,7 +357,12 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end, break; } } + if (s == expr_end) { + if (*expr_end == '!' || *expr_end == ':' || *expr_end == '=') { + RAISE_SYNTAX_ERROR("f-string: expression required before '%c'", *expr_end); + return NULL; + } RAISE_SYNTAX_ERROR("f-string: empty expression not allowed"); return NULL; } [View Less]

1 0

bpo-26120: make pydoc exclude __future__ imports from the data block of the module (GH-30888)
by iritkatriel March 28, 2022

March 28, 2022

https://github.com/python/cpython/commit/15ba8167d78f9e66bd5b07c4e5cbb04634… commit: 15ba8167d78f9e66bd5b07c4e5cbb0463460310a branch: main author: Irit Katriel <1055913+iritkatriel(a)users.noreply.github.com> committer: iritkatriel <1055913+iritkatriel(a)users.noreply.github.com> date: 2022-03-28T22:02:57+01:00 summary: bpo-26120: make pydoc exclude __future__ imports from the data block of the module (GH-30888) files: A Misc/NEWS.d/next/Library/2022-01-25-15-45-04.bpo-26120.… [View More]

1 0

bpo-47146: Eliminate a race between make regen-deepfreeze and make regen-global-objects. (gh-32162)
by ericsnowcurrently March 28, 2022

March 28, 2022

https://github.com/python/cpython/commit/4c116f716bd1c174d6530b9a7a5ed38639… commit: 4c116f716bd1c174d6530b9a7a5ed3863927a109 branch: main author: Eric Snow <ericsnowcurrently(a)gmail.com> committer: ericsnowcurrently <ericsnowcurrently(a)gmail.com> date: 2022-03-28T14:56:05-06:00 summary: bpo-47146: Eliminate a race between make regen-deepfreeze and make regen-global-objects. (gh-32162) The race likely originated with gh-32061. https://bugs.python.org/issue47146 files: M … [View More]

1 0

bpo-47138: Ensure Windows docs build uses the same pinned version as other platforms (GH-32161)
by zooba March 28, 2022

March 28, 2022

https://github.com/python/cpython/commit/295114dcd32b3aad5453e5e15e9e1befa0… commit: 295114dcd32b3aad5453e5e15e9e1befa0e5ca01 branch: main author: Steve Dower <steve.dower(a)python.org> committer: zooba <steve.dower(a)microsoft.com> date: 2022-03-28T21:38:31+01:00 summary: bpo-47138: Ensure Windows docs build uses the same pinned version as other platforms (GH-32161) files: M Doc/make.bat diff --git a/Doc/make.bat b/Doc/make.bat index 9eaaa46806829..f3e9b44d61d4a 100644 --- a/Doc/… [View More]

1 0

[3.9] bpo-44493: Add missing terminated NUL in sockaddr_un's length (GH-26866) (GH-32140) (GH-32156)
by gpshead March 28, 2022

March 28, 2022

https://github.com/python/cpython/commit/dae09c2b819c2683ad870733451c050b59… commit: dae09c2b819c2683ad870733451c050b59c3eb93 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: gpshead <greg(a)krypto.org> date: 2022-03-28T13:03:18-07:00 summary: [3.9] bpo-44493: Add missing terminated NUL in sockaddr_un's length (GH-26866) (GH-32140) (GH-32156) Add missing terminated NUL in sockaddr_un's length - Linux: https://man7.org/linux/… [View More]

1 0

bpo-28516: document contextlib.ExitStack.__enter__ behavior (GH-31636) (GH-32145)
by JelleZijlstra March 28, 2022

March 28, 2022

https://github.com/python/cpython/commit/1e3132b1c3ebff8d28a6dd353bf217cb97… commit: 1e3132b1c3ebff8d28a6dd353bf217cb97c41e81 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: JelleZijlstra <jelle.zijlstra(a)gmail.com> date: 2022-03-28T11:45:45-07:00 summary: bpo-28516: document contextlib.ExitStack.__enter__ behavior (GH-31636) (GH-32145) The enter_context is updated with following information: 'The :meth:`__enter__` method … [View More]

1 0

Fix typo in the sqlite3 docs (GH-31915)
by JelleZijlstra March 28, 2022

March 28, 2022

https://github.com/python/cpython/commit/66584c890d016e40d707400130d1cd98f2… commit: 66584c890d016e40d707400130d1cd98f2aedde9 branch: main author: Jonathan <jonathan.joyner94(a)gmail.com> committer: JelleZijlstra <jelle.zijlstra(a)gmail.com> date: 2022-03-28T11:44:41-07:00 summary: Fix typo in the sqlite3 docs (GH-31915) Co-authored-by: Jonathan <89750679+AHypnotoad(a)users.noreply.github.com> files: M Lib/sqlite3/__init__.py diff --git a/Lib/sqlite3/__init__.py b/Lib/… [View More]

1 0

[3.10] bpo-44493: Add missing terminated NUL in sockaddr_un's length (GH-26866) (GH-32140)
by miss-islington March 28, 2022

March 28, 2022

https://github.com/python/cpython/commit/5944807b09717d43bb017f700e8c451dd0… commit: 5944807b09717d43bb017f700e8c451dd07199ed 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: 2022-03-28T11:26:49-07:00 summary: [3.10] bpo-44493: Add missing terminated NUL in sockaddr_un's length (GH-26866) (GH-32140) Add missing terminated NUL in sockaddr_un's length … [View More]

1 0

bpo-47138: Fix documentation build by pinning Jinja version to 3.0.3 (GH-32153)
by ned-deily March 28, 2022

March 28, 2022

https://github.com/python/cpython/commit/25c40bd994aa0da75283c5efdd71ba26c7… commit: 25c40bd994aa0da75283c5efdd71ba26c734b67e branch: 3.9 author: Hugo van Kemenade <hugovk(a)users.noreply.github.com> committer: ned-deily <nad(a)python.org> date: 2022-03-28T13:19:56-04:00 summary: bpo-47138: Fix documentation build by pinning Jinja version to 3.0.3 (GH-32153) Co-authored-by: Maciej Olko <maciej.olko(a)gmail.com> files: A Misc/NEWS.d/next/Documentation/2022-03-28-12-32-17.bpo-… [View More]

1 0