Mailman 3 April 2022 - Python-checkins

bpo-47205: Skip error check of sched_get/setaffinity on FreeBSD (GH-32285)
by tiran April 3, 2022

April 3, 2022

https://github.com/python/cpython/commit/b82cdd1dac9a9be52051abd90a1ce69236… commit: b82cdd1dac9a9be52051abd90a1ce69236ac41f4 branch: main author: Christian Heimes <christian(a)python.org> committer: tiran <christian(a)python.org> date: 2022-04-03T17:03:49+02:00 summary: bpo-47205: Skip error check of sched_get/setaffinity on FreeBSD (GH-32285) files: A Misc/NEWS.d/next/Tests/2022-04-03-14-38-21.bpo-47205.hbbTnh.rst M Lib/test/test_posix.py diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py index c10039b17f7f8..f44b8d0403ff2 100644 --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -1194,7 +1194,9 @@ def test_sched_getaffinity(self): mask = posix.sched_getaffinity(0) self.assertIsInstance(mask, set) self.assertGreaterEqual(len(mask), 1) - self.assertRaises(OSError, posix.sched_getaffinity, -1) + if not sys.platform.startswith("freebsd"): + # bpo-47205: does not raise OSError on FreeBSD + self.assertRaises(OSError, posix.sched_getaffinity, -1) for cpu in mask: self.assertIsInstance(cpu, int) self.assertGreaterEqual(cpu, 0) @@ -1212,7 +1214,9 @@ def test_sched_setaffinity(self): self.assertRaises(ValueError, posix.sched_setaffinity, 0, [-10]) self.assertRaises(ValueError, posix.sched_setaffinity, 0, map(int, "0X")) self.assertRaises(OverflowError, posix.sched_setaffinity, 0, [1<<128]) - self.assertRaises(OSError, posix.sched_setaffinity, -1, mask) + if not sys.platform.startswith("freebsd"): + # bpo-47205: does not raise OSError on FreeBSD + self.assertRaises(OSError, posix.sched_setaffinity, -1, mask) def test_rtld_constants(self): # check presence of major RTLD_* constants diff --git a/Misc/NEWS.d/next/Tests/2022-04-03-14-38-21.bpo-47205.hbbTnh.rst b/Misc/NEWS.d/next/Tests/2022-04-03-14-38-21.bpo-47205.hbbTnh.rst new file mode 100644 index 0000000000000..35fd94421326e --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2022-04-03-14-38-21.bpo-47205.hbbTnh.rst @@ -0,0 +1,2 @@ +Skip test for :func:`~os.sched_getaffinity` and +:func:`~os.sched_setaffinity` error case on FreeBSD.

1 0

bpo-47196: Fix one more PyInit function signature (GH-32280)
by miss-islington April 3, 2022

April 3, 2022

https://github.com/python/cpython/commit/3faa9f78d4b9a8c0fd4657b434bdb08ae1… commit: 3faa9f78d4b9a8c0fd4657b434bdb08ae1f28800 branch: main author: Hood Chatham <roberthoodchatham(a)gmail.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2022-04-03T00:45:26-07:00 summary: bpo-47196: Fix one more PyInit function signature (GH-32280) I missed one PyInit function in #32244. Automerge-Triggered-By: GH:tiran files: M Modules/_testmultiphase.c diff --git a/Modules/_testmultiphase.c b/Modules/_testmultiphase.c index e9a37a019134f..1b4f58eb1c0b4 100644 --- a/Modules/_testmultiphase.c +++ b/Modules/_testmultiphase.c @@ -796,7 +796,7 @@ static PyModuleDef def_exec_raise = TEST_MODULE_DEF( "_testmultiphase_exec_raise", slots_exec_raise, NULL); PyMODINIT_FUNC -PyInit__testmultiphase_exec_raise(PyObject *mod) +PyInit__testmultiphase_exec_raise(void) { return PyModuleDef_Init(&def_exec_raise); }

1 0

bpo-44800: Document internal frame naming conventions (GH-32281)
by ncoghlan April 2, 2022

April 2, 2022

https://github.com/python/cpython/commit/124227c95f310d2ecd4b567271ab1919fc… commit: 124227c95f310d2ecd4b567271ab1919fc7000cb branch: main author: Nick Coghlan <ncoghlan(a)gmail.com> committer: ncoghlan <ncoghlan(a)gmail.com> date: 2022-04-03T16:55:55+10:00 summary: bpo-44800: Document internal frame naming conventions (GH-32281) The fact interpreter frames were split out from full frame objects rather than always being part of the eval loop implementation means that it's tricky to infer the expected naming conventions simply from looking at the code. Documenting the de facto conventions in pycore_frame.h means future readers of the code will have a clear explanation of the rationale for those conventions (i.e. minimising non-functional code churn). files: M Include/internal/pycore_frame.h diff --git a/Include/internal/pycore_frame.h b/Include/internal/pycore_frame.h index 211831a6e497f..3ea538ccc5500 100644 --- a/Include/internal/pycore_frame.h +++ b/Include/internal/pycore_frame.h @@ -7,6 +7,75 @@ extern "C" { #include <stdbool.h> #include <stddef.h> +/* Starting in CPython 3.11, CPython separates the frame state between the + * full frame objects exposed by the Python and C runtime state introspection + * APIs, and internal lighter weight interpreter frames, which are simple C + * structures owned by either the interpreter eval loop (while executing + * ordinary functions), by a generator or coroutine object (for frames that + * are able to be suspended), or by their corresponding full frame object (if + * a state instrospection API has been invoked and the full frame object has + * taken responsibility for the lifecycle of the interpreter frame). + * + * This split storage eliminates a lot of allocation and deallocation of full + * Python objects during code execution, providing a significant speed gain + * over the previous approach of using full Python objects for both + * introspection and code execution. + * + * Struct names: + * + * * PyFrameObject: the full Python frame object + * * _PyInterpreterFrame: the lightweight frame struct used by the eval loop + * * _PyCFrame: a struct that lives on the C stack and allows Python level + * recursive evaluation to be decoupled from recursive C level invocation + * of the bytecode eval loop + * * See pystate.h for more details on this struct + * + * Field naming conventions: + * + * * full frame object fields have an "f_*" (or "_f_*") prefix + * * new interpreter frame fields have no prefix + * * Several interpreter frame fields have the "f_*" prefix as a result of + * trying to keep diffs as small as was feasible when splitting the original + * frame struct definition in two. The following are all interpreter frame + * fields, NOT full frame object fields: + * * f_func + * * f_globals + * * f_builtins + * * f_locals + * * f_code + * * f_lasti + * * f_state + * * Renaming those fields was considered but ultimately deemed too disruptive + * to key third party projects that were trying to keep up with the Python + * 3.11 code evaluation changes during the alpha release cycle + * (see bpo-44800 for details) + * + * Naming conventions for local variables, function parameters and fields in other structs: + * + * * "frame" and "f" may refer to either full frame objects or interpreter frames + * * the context of use or the field naming conventions usually make the + * type being referenced unambiguous in code reviews + * * the following alternative names are used when more clarity is needed: + * * full frame objects: "frame_obj" (and variants like "frameobj" or "fobj") + * * interpreter frame structs: "frame_data" or "iframe" + * * "current frame" should NOT be abbreviated as "cframe", as the latter now + * typically refers to _PyCFrame structs + * + * Function/macro parameter types: + * + * * "PyFrame_*" functions and other public C API functions that relate to + * frames accept full frame object pointers + * * "_PyFrame_*" functions and other private C API functions that relate to + * frames accept either full frame object or interpreter frame pointers. + * Check the specific function signatures for details. + * + * Function return types: + * + * * Public C API functions will only ever return full frame object pointers + * * Private C API functions with an underscore prefix may return interpreter + * frame pointers instead. Check the specific function signatures for details. + */ + struct _frame { PyObject_HEAD PyFrameObject *f_back; /* previous frame, or NULL */

1 0

Language reference: Remove duplicated text about iterable unpacking (GH-25212)
by miss-islington April 2, 2022

April 2, 2022

https://github.com/python/cpython/commit/b5092350b2f70ec3519761c60f7399ebcc… commit: b5092350b2f70ec3519761c60f7399ebcc04ebed branch: 3.9 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-04-02T20:06:54-07:00 summary: Language reference: Remove duplicated text about iterable unpacking (GH-25212) (cherry picked from commit 4f5d56f8f33196f5ed8ffad0ab2f012afda2f9b3) Co-authored-by: Jiashuo Li <4003950+jiasli(a)users.noreply.github.com> files: M Doc/reference/simple_stmts.rst diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst index 79f4011307ed8..5f9e8dc1791d5 100644 --- a/Doc/reference/simple_stmts.rst +++ b/Doc/reference/simple_stmts.rst @@ -124,9 +124,7 @@ square brackets, is recursively defined as follows. * If the target list is a single target with no trailing comma, optionally in parentheses, the object is assigned to that target. -* Else: The object must be an iterable with the same number of - items as there are targets in the target list, and the items are assigned, - from left to right, to the corresponding targets. +* Else: * If the target list contains one target prefixed with an asterisk, called a "starred" target: The object must be an iterable with at least as many items

1 0

Language reference: Remove duplicated text about iterable unpacking (GH-25212)
by miss-islington April 2, 2022

April 2, 2022

https://github.com/python/cpython/commit/a5c90784be0bf70287bac4195573e85e95… commit: a5c90784be0bf70287bac4195573e85e956c2332 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-04-02T20:05:11-07:00 summary: Language reference: Remove duplicated text about iterable unpacking (GH-25212) (cherry picked from commit 4f5d56f8f33196f5ed8ffad0ab2f012afda2f9b3) Co-authored-by: Jiashuo Li <4003950+jiasli(a)users.noreply.github.com> files: M Doc/reference/simple_stmts.rst diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst index 92dfcb0461e60..8dfc01db263f5 100644 --- a/Doc/reference/simple_stmts.rst +++ b/Doc/reference/simple_stmts.rst @@ -124,9 +124,7 @@ square brackets, is recursively defined as follows. * If the target list is a single target with no trailing comma, optionally in parentheses, the object is assigned to that target. -* Else: The object must be an iterable with the same number of - items as there are targets in the target list, and the items are assigned, - from left to right, to the corresponding targets. +* Else: * If the target list contains one target prefixed with an asterisk, called a "starred" target: The object must be an iterable with at least as many items

1 0

Language reference: Remove duplicated text about iterable unpacking (GH-25212)
by JelleZijlstra April 2, 2022

April 2, 2022

https://github.com/python/cpython/commit/4f5d56f8f33196f5ed8ffad0ab2f012afd… commit: 4f5d56f8f33196f5ed8ffad0ab2f012afda2f9b3 branch: main author: Jiashuo Li <4003950+jiasli(a)users.noreply.github.com> committer: JelleZijlstra <jelle.zijlstra(a)gmail.com> date: 2022-04-02T19:41:16-07:00 summary: Language reference: Remove duplicated text about iterable unpacking (GH-25212) files: M Doc/reference/simple_stmts.rst diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst index e9795d8deffc7..5f19a3822ba9f 100644 --- a/Doc/reference/simple_stmts.rst +++ b/Doc/reference/simple_stmts.rst @@ -124,9 +124,7 @@ square brackets, is recursively defined as follows. * If the target list is a single target with no trailing comma, optionally in parentheses, the object is assigned to that target. -* Else: The object must be an iterable with the same number of - items as there are targets in the target list, and the items are assigned, - from left to right, to the corresponding targets. +* Else: * If the target list contains one target prefixed with an asterisk, called a "starred" target: The object must be an iterable with at least as many items

1 0

bpo-46033: Clarify for-statement execution (GH-30025)
by terryjreedy April 2, 2022

April 2, 2022

https://github.com/python/cpython/commit/281f980d354d1709018a2dc77f79388faf… commit: 281f980d354d1709018a2dc77f79388faf3e56c0 branch: main author: Michał D <michcio1234(a)gmail.com> committer: terryjreedy <tjreedy(a)udel.edu> date: 2022-04-02T20:52:20-04:00 summary: bpo-46033: Clarify for-statement execution (GH-30025) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> Co-authored-by: Jelle Zijlstra <jelle.zijlstra(a)gmail.com> files: A Misc/NEWS.d/next/Documentation/2022-01-03-18-50-39.bpo-46033.7WeF0f.rst M Doc/reference/compound_stmts.rst diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst index 92024e51ef4fc..688407195f05d 100644 --- a/Doc/reference/compound_stmts.rst +++ b/Doc/reference/compound_stmts.rst @@ -157,17 +157,14 @@ The :keyword:`for` statement is used to iterate over the elements of a sequence for_stmt: "for" `target_list` "in" `starred_list` ":" `suite` : ["else" ":" `suite`] -The expression list is evaluated once; it should yield an iterable object. An -iterator is created for the result of the ``starred_list``. The expression -list can contain starred elements (``*x, *y``) that will be unpacked in the -final iterator (as when constructing a ``tuple`` or ``list`` literal). The -suite is then executed once for each item provided by the iterator, in the -order returned by the iterator. Each item in turn is assigned to the target -list using the standard rules for assignments (see :ref:`assignment`), and then -the suite is executed. When the items are exhausted (which is immediately when -the sequence is empty or an iterator raises a :exc:`StopIteration` exception), -the suite in the :keyword:`!else` clause, if present, is executed, and the loop -terminates. +The ``starred_list`` expression is evaluated once; it should yield an +:term:`iterable` object. An :term:`iterator` is created for that iterable. +The first item provided +by the iterator is then assigned to the target list using the standard +rules for assignments (see :ref:`assignment`), and the suite is executed. This +repeats for each item provided by the iterator. When the iterator is exhausted, +the suite in the :keyword:`!else` clause, +if present, is executed, and the loop terminates. .. index:: statement: break diff --git a/Misc/NEWS.d/next/Documentation/2022-01-03-18-50-39.bpo-46033.7WeF0f.rst b/Misc/NEWS.d/next/Documentation/2022-01-03-18-50-39.bpo-46033.7WeF0f.rst new file mode 100644 index 0000000000000..a484def239d8b --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2022-01-03-18-50-39.bpo-46033.7WeF0f.rst @@ -0,0 +1 @@ +Clarify ``for`` statement execution in its doc.

1 0

bpo-24563: Link encoding names to encoding declarations (GH-32274)
by miss-islington April 2, 2022

April 2, 2022

https://github.com/python/cpython/commit/ce6af314ca8529d5ed0f307deb9c33029a… commit: ce6af314ca8529d5ed0f307deb9c33029a69f4cb 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-04-02T17:40:55-07:00 summary: bpo-24563: Link encoding names to encoding declarations (GH-32274) (cherry picked from commit 01be5d6446abbdd95d0c18bd19a58a62b05568d8) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: M Doc/reference/lexical_analysis.rst diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst index 21ad3731a3246..d9e2cead958c9 100644 --- a/Doc/reference/lexical_analysis.rst +++ b/Doc/reference/lexical_analysis.rst @@ -101,12 +101,11 @@ addition, if the first bytes of the file are the UTF-8 byte-order mark (``b'\xef\xbb\xbf'``), the declared file encoding is UTF-8 (this is supported, among others, by Microsoft's :program:`notepad`). -If an encoding is declared, the encoding name must be recognized by Python. The +If an encoding is declared, the encoding name must be recognized by Python +(see :ref:`standard-encodings`). The encoding is used for all lexical analysis, including string literals, comments and identifiers. -.. XXX there should be a list of supported encodings. - .. _explicit-joining:

1 0

bpo-24563: Link encoding names to encoding declarations (GH-32274)
by miss-islington April 2, 2022

April 2, 2022

https://github.com/python/cpython/commit/f4e280d8c5461fa5e928fa07f6cd1779a4… commit: f4e280d8c5461fa5e928fa07f6cd1779a4ac43ba branch: 3.9 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-04-02T17:40:31-07:00 summary: bpo-24563: Link encoding names to encoding declarations (GH-32274) (cherry picked from commit 01be5d6446abbdd95d0c18bd19a58a62b05568d8) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: M Doc/reference/lexical_analysis.rst diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst index 77e0578f5d89b..17c0fb4a51eb4 100644 --- a/Doc/reference/lexical_analysis.rst +++ b/Doc/reference/lexical_analysis.rst @@ -101,12 +101,11 @@ addition, if the first bytes of the file are the UTF-8 byte-order mark (``b'\xef\xbb\xbf'``), the declared file encoding is UTF-8 (this is supported, among others, by Microsoft's :program:`notepad`). -If an encoding is declared, the encoding name must be recognized by Python. The +If an encoding is declared, the encoding name must be recognized by Python +(see :ref:`standard-encodings`). The encoding is used for all lexical analysis, including string literals, comments and identifiers. -.. XXX there should be a list of supported encodings. - .. _explicit-joining:

1 0

bpo-24563: Link encoding names to encoding declarations (GH-32274)
by terryjreedy April 2, 2022

April 2, 2022

https://github.com/python/cpython/commit/01be5d6446abbdd95d0c18bd19a58a62b0… commit: 01be5d6446abbdd95d0c18bd19a58a62b05568d8 branch: main author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: terryjreedy <tjreedy(a)udel.edu> date: 2022-04-02T20:13:37-04:00 summary: bpo-24563: Link encoding names to encoding declarations (GH-32274) files: M Doc/reference/lexical_analysis.rst diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst index b69d0fbdd41f8..dba1a9dd2e15a 100644 --- a/Doc/reference/lexical_analysis.rst +++ b/Doc/reference/lexical_analysis.rst @@ -101,12 +101,11 @@ addition, if the first bytes of the file are the UTF-8 byte-order mark (``b'\xef\xbb\xbf'``), the declared file encoding is UTF-8 (this is supported, among others, by Microsoft's :program:`notepad`). -If an encoding is declared, the encoding name must be recognized by Python. The +If an encoding is declared, the encoding name must be recognized by Python +(see :ref:`standard-encodings`). The encoding is used for all lexical analysis, including string literals, comments and identifiers. -.. XXX there should be a list of supported encodings. - .. _explicit-joining:

1 0