Mailman 3 January 2025 - Python-checkins

[3.13] gh-128998: Fix indentation of numbered list and literal block (GH-128999) (#129000)
by AA-Turner Jan. 18, 2025

Jan. 18, 2025

https://github.com/python/cpython/commit/03ee311e5a454dce665f14deac91687a75… commit: 03ee311e5a454dce665f14deac91687a752e1679 branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: AA-Turner <9087854+AA-Turner(a)users.noreply.github.com> date: 2025-01-18T20:58:20Z summary: [3.13] gh-128998: Fix indentation of numbered list and literal block (GH-128999) (#129000) gh-128998: Fix indentation of numbered list and literal block (GH-128999) (cherry picked from commit e8092e5cdcd6707ac0b16d8fb37fa080a88bcc97) Co-authored-by: Rafael Fontenelle <rffontenelle(a)users.noreply.github.com> Co-authored-by: Adam Turner <9087854+AA-Turner(a)users.noreply.github.com> files: M Doc/faq/programming.rst diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index fa7b22bde1dc6f..776bab1ed5b779 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -1906,28 +1906,30 @@ In the standard library code, you will see several common patterns for correctly using identity tests: 1) As recommended by :pep:`8`, an identity test is the preferred way to check -for ``None``. This reads like plain English in code and avoids confusion with -other objects that may have boolean values that evaluate to false. + for ``None``. This reads like plain English in code and avoids confusion + with other objects that may have boolean values that evaluate to false. 2) Detecting optional arguments can be tricky when ``None`` is a valid input -value. In those situations, you can create a singleton sentinel object -guaranteed to be distinct from other objects. For example, here is how -to implement a method that behaves like :meth:`dict.pop`:: + value. In those situations, you can create a singleton sentinel object + guaranteed to be distinct from other objects. For example, here is how + to implement a method that behaves like :meth:`dict.pop`: - _sentinel = object() + .. code-block:: python - def pop(self, key, default=_sentinel): - if key in self: - value = self[key] - del self[key] - return value - if default is _sentinel: - raise KeyError(key) - return default + _sentinel = object() + + def pop(self, key, default=_sentinel): + if key in self: + value = self[key] + del self[key] + return value + if default is _sentinel: + raise KeyError(key) + return default 3) Container implementations sometimes need to augment equality tests with -identity tests. This prevents the code from being confused by objects such as -``float('NaN')`` that are not equal to themselves. + identity tests. This prevents the code from being confused by objects + such as ``float('NaN')`` that are not equal to themselves. For example, here is the implementation of :meth:`!collections.abc.Sequence.__contains__`::

1 0

gh-128998: Fix indentation of numbered list and literal block (#128999)
by AA-Turner Jan. 18, 2025

Jan. 18, 2025

https://github.com/python/cpython/commit/e8092e5cdcd6707ac0b16d8fb37fa080a8… commit: e8092e5cdcd6707ac0b16d8fb37fa080a88bcc97 branch: main author: Rafael Fontenelle <rffontenelle(a)users.noreply.github.com> committer: AA-Turner <9087854+AA-Turner(a)users.noreply.github.com> date: 2025-01-18T20:52:30Z summary: gh-128998: Fix indentation of numbered list and literal block (#128999) Co-authored-by: Adam Turner <9087854+AA-Turner(a)users.noreply.github.com> files: M Doc/faq/programming.rst diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index fa7b22bde1dc6f..776bab1ed5b779 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -1906,28 +1906,30 @@ In the standard library code, you will see several common patterns for correctly using identity tests: 1) As recommended by :pep:`8`, an identity test is the preferred way to check -for ``None``. This reads like plain English in code and avoids confusion with -other objects that may have boolean values that evaluate to false. + for ``None``. This reads like plain English in code and avoids confusion + with other objects that may have boolean values that evaluate to false. 2) Detecting optional arguments can be tricky when ``None`` is a valid input -value. In those situations, you can create a singleton sentinel object -guaranteed to be distinct from other objects. For example, here is how -to implement a method that behaves like :meth:`dict.pop`:: + value. In those situations, you can create a singleton sentinel object + guaranteed to be distinct from other objects. For example, here is how + to implement a method that behaves like :meth:`dict.pop`: - _sentinel = object() + .. code-block:: python - def pop(self, key, default=_sentinel): - if key in self: - value = self[key] - del self[key] - return value - if default is _sentinel: - raise KeyError(key) - return default + _sentinel = object() + + def pop(self, key, default=_sentinel): + if key in self: + value = self[key] + del self[key] + return value + if default is _sentinel: + raise KeyError(key) + return default 3) Container implementations sometimes need to augment equality tests with -identity tests. This prevents the code from being confused by objects such as -``float('NaN')`` that are not equal to themselves. + identity tests. This prevents the code from being confused by objects + such as ``float('NaN')`` that are not equal to themselves. For example, here is the implementation of :meth:`!collections.abc.Sequence.__contains__`::

1 0

[3.12] Pre-commit: Drop specific language version and bump hooks (GH-128801) (#128997)
by hugovk Jan. 18, 2025

Jan. 18, 2025

https://github.com/python/cpython/commit/4219cda83d36892efcf945ff62211742bc… commit: 4219cda83d36892efcf945ff62211742bc051007 branch: 3.12 author: Peter Bierma <zintensitydev(a)gmail.com> committer: hugovk <1324225+hugovk(a)users.noreply.github.com> date: 2025-01-18T22:52:24+02:00 summary: [3.12] Pre-commit: Drop specific language version and bump hooks (GH-128801) (#128997) files: M .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 30c4395e17b3c9..ad91fe68a33cf6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.8.2 + rev: v0.9.1 hooks: - id: ruff name: Run Ruff (lint) on Doc/ @@ -34,7 +34,7 @@ repos: types_or: [c, inc, python, rst] - repo: https://github.com/woodruffw/zizmor-pre-commit - rev: v0.8.0 + rev: v1.1.1 hooks: - id: zizmor

1 0

[3.13] Pre-commit: Drop specific language version and bump hooks (GH-128801) (#128994)
by hugovk Jan. 18, 2025

Jan. 18, 2025

https://github.com/python/cpython/commit/453eaa9ffcef1ab1910648d8c4b2236f0b… commit: 453eaa9ffcef1ab1910648d8c4b2236f0b5830c1 branch: 3.13 author: Peter Bierma <zintensitydev(a)gmail.com> committer: hugovk <1324225+hugovk(a)users.noreply.github.com> date: 2025-01-18T22:52:07+02:00 summary: [3.13] Pre-commit: Drop specific language version and bump hooks (GH-128801) (#128994) Co-authored-by: Peter Bierma <zintensitydev(a)gmail.com> files: M .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e2f00bae944f2f..7f38c3e848f03d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.8.2 + rev: v0.9.1 hooks: - id: ruff name: Run Ruff (lint) on Doc/ @@ -25,7 +25,6 @@ repos: - id: black name: Run Black on Tools/jit/ files: ^Tools/jit/ - language_version: python3.12 - repo: https://github.com/pre-commit/pre-commit-hooks rev: v5.0.0 @@ -42,7 +41,7 @@ repos: types_or: [c, inc, python, rst] - repo: https://github.com/woodruffw/zizmor-pre-commit - rev: v0.8.0 + rev: v1.1.1 hooks: - id: zizmor

1 0

[3.12] gh-121542: Document trailing newline behavior in `set_content()` (GH-121543) (#128996)
by Eclips4 Jan. 18, 2025

Jan. 18, 2025

https://github.com/python/cpython/commit/104d37ad99389648bc270d9d32aaa6b764… commit: 104d37ad99389648bc270d9d32aaa6b764e6e04f branch: 3.12 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Eclips4 <kirill.bast9(a)mail.ru> date: 2025-01-18T18:41:59Z summary: [3.12] gh-121542: Document trailing newline behavior in `set_content()` (GH-121543) (#128996) gh-121542: Document trailing newline behavior in `set_content()` (GH-121543) (cherry picked from commit fba475ae6f932d0aaee6832b4102b2d4c50df70f) Co-authored-by: Peter Bierma <zintensitydev(a)gmail.com> Co-authored-by: Yizheng Meng <dev(a)rapidcow.org> files: M Doc/library/email.contentmanager.rst diff --git a/Doc/library/email.contentmanager.rst b/Doc/library/email.contentmanager.rst index a86e227429b06d..b33fe82a6e4c9f 100644 --- a/Doc/library/email.contentmanager.rst +++ b/Doc/library/email.contentmanager.rst @@ -157,7 +157,13 @@ Currently the email package provides only one concrete content manager, :exc:`ValueError`. * For ``str`` objects, if *cte* is not set use heuristics to - determine the most compact encoding. + determine the most compact encoding. Prior to encoding, + :meth:`str.splitlines` is used to normalize all line boundaries, + ensuring that each line of the payload is terminated by the + current policy's :data:`~email.policy.Policy.linesep` property + (even if the original string did not end with one). + * For ``bytes`` objects, *cte* is taken to be base64 if not set, + and the aforementioned newline translation is not performed. * For :class:`~email.message.EmailMessage`, per :rfc:`2046`, raise an error if a *cte* of ``quoted-printable`` or ``base64`` is requested for *subtype* ``rfc822``, and for any *cte* other than

1 0

[3.13] gh-121542: Document trailing newline behavior in `set_content()` (GH-121543) (#128995)
by Eclips4 Jan. 18, 2025

Jan. 18, 2025

https://github.com/python/cpython/commit/b7ddcc3efb4e3610471880e1e904f42f39… commit: b7ddcc3efb4e3610471880e1e904f42f39bbb2f4 branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Eclips4 <kirill.bast9(a)mail.ru> date: 2025-01-18T18:40:30Z summary: [3.13] gh-121542: Document trailing newline behavior in `set_content()` (GH-121543) (#128995) gh-121542: Document trailing newline behavior in `set_content()` (GH-121543) (cherry picked from commit fba475ae6f932d0aaee6832b4102b2d4c50df70f) Co-authored-by: Peter Bierma <zintensitydev(a)gmail.com> Co-authored-by: Yizheng Meng <dev(a)rapidcow.org> files: M Doc/library/email.contentmanager.rst diff --git a/Doc/library/email.contentmanager.rst b/Doc/library/email.contentmanager.rst index a86e227429b06d..b33fe82a6e4c9f 100644 --- a/Doc/library/email.contentmanager.rst +++ b/Doc/library/email.contentmanager.rst @@ -157,7 +157,13 @@ Currently the email package provides only one concrete content manager, :exc:`ValueError`. * For ``str`` objects, if *cte* is not set use heuristics to - determine the most compact encoding. + determine the most compact encoding. Prior to encoding, + :meth:`str.splitlines` is used to normalize all line boundaries, + ensuring that each line of the payload is terminated by the + current policy's :data:`~email.policy.Policy.linesep` property + (even if the original string did not end with one). + * For ``bytes`` objects, *cte* is taken to be base64 if not set, + and the aforementioned newline translation is not performed. * For :class:`~email.message.EmailMessage`, per :rfc:`2046`, raise an error if a *cte* of ``quoted-printable`` or ``base64`` is requested for *subtype* ``rfc822``, and for any *cte* other than

1 0

gh-121542: Document trailing newline behavior in `set_content()` (#121543)
by Eclips4 Jan. 18, 2025

Jan. 18, 2025

https://github.com/python/cpython/commit/fba475ae6f932d0aaee6832b4102b2d4c5… commit: fba475ae6f932d0aaee6832b4102b2d4c50df70f branch: main author: Peter Bierma <zintensitydev(a)gmail.com> committer: Eclips4 <kirill.bast9(a)mail.ru> date: 2025-01-18T20:34:40+02:00 summary: gh-121542: Document trailing newline behavior in `set_content()` (#121543) Co-authored-by: Yizheng Meng <dev(a)rapidcow.org> files: M Doc/library/email.contentmanager.rst diff --git a/Doc/library/email.contentmanager.rst b/Doc/library/email.contentmanager.rst index a86e227429b06d..b33fe82a6e4c9f 100644 --- a/Doc/library/email.contentmanager.rst +++ b/Doc/library/email.contentmanager.rst @@ -157,7 +157,13 @@ Currently the email package provides only one concrete content manager, :exc:`ValueError`. * For ``str`` objects, if *cte* is not set use heuristics to - determine the most compact encoding. + determine the most compact encoding. Prior to encoding, + :meth:`str.splitlines` is used to normalize all line boundaries, + ensuring that each line of the payload is terminated by the + current policy's :data:`~email.policy.Policy.linesep` property + (even if the original string did not end with one). + * For ``bytes`` objects, *cte* is taken to be base64 if not set, + and the aforementioned newline translation is not performed. * For :class:`~email.message.EmailMessage`, per :rfc:`2046`, raise an error if a *cte* of ``quoted-printable`` or ``base64`` is requested for *subtype* ``rfc822``, and for any *cte* other than

1 0

Pre-commit: Drop specific language version and bump hooks (#128801)
by hugovk Jan. 18, 2025

Jan. 18, 2025

https://github.com/python/cpython/commit/3de7cc15c2f3186b84c0fb105bc84c27e9… commit: 3de7cc15c2f3186b84c0fb105bc84c27e9589902 branch: main author: Peter Bierma <zintensitydev(a)gmail.com> committer: hugovk <1324225+hugovk(a)users.noreply.github.com> date: 2025-01-18T19:53:17+02:00 summary: Pre-commit: Drop specific language version and bump hooks (#128801) files: M .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index af6accd89b5bd4..74b56f060342bf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.8.2 + rev: v0.9.1 hooks: - id: ruff name: Run Ruff (lint) on Doc/ @@ -29,12 +29,10 @@ repos: - id: black name: Run Black on Tools/build/check_warnings.py files: ^Tools/build/check_warnings.py - language_version: python3.12 args: [--line-length=79] - id: black name: Run Black on Tools/jit/ files: ^Tools/jit/ - language_version: python3.12 - repo: https://github.com/pre-commit/pre-commit-hooks rev: v5.0.0 @@ -51,19 +49,19 @@ repos: types_or: [c, inc, python, rst] - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.30.0 + rev: 0.31.0 hooks: - id: check-dependabot - id: check-github-workflows - id: check-readthedocs - repo: https://github.com/rhysd/actionlint - rev: v1.7.4 + rev: v1.7.6 hooks: - id: actionlint - repo: https://github.com/woodruffw/zizmor-pre-commit - rev: v0.8.0 + rev: v1.1.1 hooks: - id: zizmor

1 0

[3.13] gh-127599: Fix _Py_RefcntAdd missing calls to _Py_INCREF_STAT_INC/_Py_INCREF_IMMORTAL_STAT_INC (GH-127717) (#128713)
by Eclips4 Jan. 18, 2025

Jan. 18, 2025

https://github.com/python/cpython/commit/fdac3629e9e82f6908a8f2b7f4a88f7a04… commit: fdac3629e9e82f6908a8f2b7f4a88f7a0488229b branch: 3.13 author: Ed Nutting <github(a)ednutting.com> committer: Eclips4 <kirill.bast9(a)mail.ru> date: 2025-01-18T19:00:46+02:00 summary: [3.13] gh-127599: Fix _Py_RefcntAdd missing calls to _Py_INCREF_STAT_INC/_Py_INCREF_IMMORTAL_STAT_INC (GH-127717) (#128713) Previously, `_Py_RefcntAdd` hasn't called `_Py_INCREF_STAT_INC/_Py_INCREF_IMMORTAL_STAT_INC` which is incorrect. Now it has been fixed. (cherry picked from commit ab05beb8cea62636bd86f6f7cf1a82d7efca7162) files: A Misc/NEWS.d/next/Core_and_Builtins/2024-12-07-13-06-09.gh-issue-127599.tXCZb_.rst M Include/cpython/pystats.h M Include/internal/pycore_object.h diff --git a/Include/cpython/pystats.h b/Include/cpython/pystats.h index c4480758f48514..378c2760ec3f55 100644 --- a/Include/cpython/pystats.h +++ b/Include/cpython/pystats.h @@ -18,6 +18,12 @@ // // Define _PY_INTERPRETER macro to increment interpreter_increfs and // interpreter_decrefs. Otherwise, increment increfs and decrefs. +// +// The number of incref operations counted by `incref` and +// `interpreter_incref` is the number of increment operations, which is +// not equal to the total of all reference counts. A single increment +// operation may increase the reference count of an object by more than +// one. For example, see `_Py_RefcntAdd`. #ifndef Py_CPYTHON_PYSTATS_H # error "this header file must not be included directly" diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h index 43a7e102ab3859..07b5a95ae1a037 100644 --- a/Include/internal/pycore_object.h +++ b/Include/internal/pycore_object.h @@ -155,6 +155,10 @@ static inline void _Py_RefcntAdd(PyObject* op, Py_ssize_t n) _Py_atomic_add_ssize(&op->ob_ref_shared, (n << _Py_REF_SHARED_SHIFT)); } #endif + // Although the ref count was increased by `n` (which may be greater than 1) + // it is only a single increment (i.e. addition) operation, so only 1 refcnt + // increment operation is counted. + _Py_INCREF_STAT_INC(); } #define _Py_RefcntAdd(op, n) _Py_RefcntAdd(_PyObject_CAST(op), n) diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2024-12-07-13-06-09.gh-issue-127599.tXCZb_.rst b/Misc/NEWS.d/next/Core_and_Builtins/2024-12-07-13-06-09.gh-issue-127599.tXCZb_.rst new file mode 100644 index 00000000000000..565ecb82c71926 --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2024-12-07-13-06-09.gh-issue-127599.tXCZb_.rst @@ -0,0 +1,2 @@ +Fix statistics for increments of object reference counts (in particular, when +a reference count was increased by more than 1 in a single operation).

1 0

[3.12] gh-127599: Fix _Py_RefcntAdd missing calls to _Py_INCREF_STAT_INC/_Py_INCREF_IMMORTAL_STAT_INC (GH-127717) (#128712)
by Eclips4 Jan. 18, 2025

Jan. 18, 2025

https://github.com/python/cpython/commit/bca489076f1834fc9544a9581aeb2df565… commit: bca489076f1834fc9544a9581aeb2df565af954c branch: 3.12 author: Ed Nutting <github(a)ednutting.com> committer: Eclips4 <kirill.bast9(a)mail.ru> date: 2025-01-18T19:00:18+02:00 summary: [3.12] gh-127599: Fix _Py_RefcntAdd missing calls to _Py_INCREF_STAT_INC/_Py_INCREF_IMMORTAL_STAT_INC (GH-127717) (#128712) Previously, `_Py_RefcntAdd` hasn't called `_Py_INCREF_STAT_INC/_Py_INCREF_IMMORTAL_STAT_INC` which is incorrect. Now it has been fixed. (cherry picked from commit ab05beb8cea62636bd86f6f7cf1a82d7efca7162) files: A Misc/NEWS.d/next/Core_and_Builtins/2024-12-07-13-06-09.gh-issue-127599.tXCZb_.rst M Include/internal/pycore_object.h diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h index 546f98d96d36ec..de82d9e76f3ca1 100644 --- a/Include/internal/pycore_object.h +++ b/Include/internal/pycore_object.h @@ -65,6 +65,11 @@ static inline void _Py_RefcntAdd(PyObject* op, Py_ssize_t n) _Py_AddRefTotal(_PyInterpreterState_GET(), n); #endif op->ob_refcnt += n; + + // Although the ref count was increased by `n` (which may be greater than 1) + // it is only a single increment (i.e. addition) operation, so only 1 refcnt + // increment operation is counted. + _Py_INCREF_STAT_INC(); } #define _Py_RefcntAdd(op, n) _Py_RefcntAdd(_PyObject_CAST(op), n) diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2024-12-07-13-06-09.gh-issue-127599.tXCZb_.rst b/Misc/NEWS.d/next/Core_and_Builtins/2024-12-07-13-06-09.gh-issue-127599.tXCZb_.rst new file mode 100644 index 00000000000000..565ecb82c71926 --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2024-12-07-13-06-09.gh-issue-127599.tXCZb_.rst @@ -0,0 +1,2 @@ +Fix statistics for increments of object reference counts (in particular, when +a reference count was increased by more than 1 in a single operation).

1 0