Mailman 3 January 2025 - Python-checkins

gh-128437: Add `BOLT_COMMON_FLAGS` with `-update-debug-sections` (gh-128455)
by corona10 04 Jan '25

04 Jan '25

https://github.com/python/cpython/commit/b60044b838f3ea97395cd6f3adbd533035… commit: b60044b838f3ea97395cd6f3adbd5330356fc273 branch: main author: Zanie Blue <contact(a)zanie.dev> committer: corona10 <donghee.na92(a)gmail.com> date: 2025-01-05T13:16:30+09:00 summary: gh-128437: Add `BOLT_COMMON_FLAGS` with `-update-debug-sections` (gh-128455) Add `BOLT_COMMON_FLAGS` with `-update-debug-sections` Co-authored-by: Gregory Szorc <gregory.szorc(a)gmail.com> files: M configure M configure.ac diff --git a/configure b/configure index aa88c74c61156c..61ee51c4b36473 100755 --- a/configure +++ b/configure @@ -907,6 +907,7 @@ CFLAGS_ALIASING OPT BOLT_APPLY_FLAGS BOLT_INSTRUMENT_FLAGS +BOLT_COMMON_FLAGS BOLT_BINARIES MERGE_FDATA LLVM_BOLT @@ -1142,6 +1143,7 @@ LIBS CPPFLAGS CPP PROFILE_TASK +BOLT_COMMON_FLAGS BOLT_INSTRUMENT_FLAGS BOLT_APPLY_FLAGS LIBUUID_CFLAGS @@ -1963,6 +1965,8 @@ Some influential environment variables: CPP C preprocessor PROFILE_TASK Python args for PGO generation task + BOLT_COMMON_FLAGS + Common arguments to llvm-bolt when instrumenting and applying BOLT_INSTRUMENT_FLAGS Arguments to llvm-bolt when instrumenting binaries BOLT_APPLY_FLAGS @@ -9389,11 +9393,21 @@ then : fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking BOLT_COMMON_FLAGS" >&5 +printf %s "checking BOLT_COMMON_FLAGS... " >&6; } +if test -z "${BOLT_COMMON_FLAGS}" +then + BOLT_COMMON_FLAGS=-update-debug-sections + +fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking BOLT_INSTRUMENT_FLAGS" >&5 printf %s "checking BOLT_INSTRUMENT_FLAGS... " >&6; } if test -z "${BOLT_INSTRUMENT_FLAGS}" then - BOLT_INSTRUMENT_FLAGS= + BOLT_INSTRUMENT_FLAGS="${BOLT_COMMON_FLAGS}" fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BOLT_INSTRUMENT_FLAGS" >&5 printf "%s\n" "$BOLT_INSTRUMENT_FLAGS" >&6; } @@ -9403,7 +9417,7 @@ printf "%s\n" "$BOLT_INSTRUMENT_FLAGS" >&6; } printf %s "checking BOLT_APPLY_FLAGS... " >&6; } if test -z "${BOLT_APPLY_FLAGS}" then - BOLT_APPLY_FLAGS=" -update-debug-sections -reorder-blocks=ext-tsp -reorder-functions=cdsort -split-functions -icf=1 -inline-all -split-eh -reorder-functions-use-hot-size -peepholes=none -jump-tables=aggressive -inline-ap -indirect-call-promotion=all -dyno-stats -use-gnu-stack -frame-opt=hot " + BOLT_APPLY_FLAGS=" ${BOLT_COMMON_FLAGS} -reorder-blocks=ext-tsp -reorder-functions=cdsort -split-functions -icf=1 -inline-all -split-eh -reorder-functions-use-hot-size -peepholes=none -jump-tables=aggressive -inline-ap -indirect-call-promotion=all -dyno-stats -use-gnu-stack -frame-opt=hot " fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BOLT_APPLY_FLAGS" >&5 diff --git a/configure.ac b/configure.ac index 1def41176337e3..172e8a1a842010 100644 --- a/configure.ac +++ b/configure.ac @@ -2160,6 +2160,20 @@ AS_VAR_IF([enable_shared], [yes], [ BOLT_BINARIES="${BOLT_BINARIES} \$(INSTSONAME)" ]) +AC_ARG_VAR( + [BOLT_COMMON_FLAGS], + [Common arguments to llvm-bolt when instrumenting and applying] +) + +AC_MSG_CHECKING([BOLT_COMMON_FLAGS]) +if test -z "${BOLT_COMMON_FLAGS}" +then + AS_VAR_SET( + [BOLT_COMMON_FLAGS], + [-update-debug-sections] + ) +fi + AC_ARG_VAR( [BOLT_INSTRUMENT_FLAGS], [Arguments to llvm-bolt when instrumenting binaries] @@ -2167,7 +2181,7 @@ AC_ARG_VAR( AC_MSG_CHECKING([BOLT_INSTRUMENT_FLAGS]) if test -z "${BOLT_INSTRUMENT_FLAGS}" then - BOLT_INSTRUMENT_FLAGS= + BOLT_INSTRUMENT_FLAGS="${BOLT_COMMON_FLAGS}" fi AC_MSG_RESULT([$BOLT_INSTRUMENT_FLAGS]) @@ -2181,7 +2195,7 @@ then AS_VAR_SET( [BOLT_APPLY_FLAGS], [m4_normalize(" - -update-debug-sections + ${BOLT_COMMON_FLAGS} -reorder-blocks=ext-tsp -reorder-functions=cdsort -split-functions

1 0

gh-115765: Document and enforce Autoconf 2.72 requirement (#128502)
by erlend-aasland 04 Jan '25

04 Jan '25

https://github.com/python/cpython/commit/0cafa97932c6574734bbaa07180bbd5a76… commit: 0cafa97932c6574734bbaa07180bbd5a762b01a6 branch: main author: Erlend E. Aasland <erlend(a)python.org> committer: erlend-aasland <erlend.aasland(a)protonmail.com> date: 2025-01-04T23:38:46Z summary: gh-115765: Document and enforce Autoconf 2.72 requirement (#128502) files: M Doc/using/configure.rst M configure.ac diff --git a/Doc/using/configure.rst b/Doc/using/configure.rst index e7733a6dc11451..82df8dfc948ed2 100644 --- a/Doc/using/configure.rst +++ b/Doc/using/configure.rst @@ -29,7 +29,7 @@ Features and minimum versions required to build CPython: * Tcl/Tk 8.5.12 for the :mod:`tkinter` module. -* Autoconf 2.71 and aclocal 1.16.5 are required to regenerate the +* Autoconf 2.72 and aclocal 1.16.5 are required to regenerate the :file:`configure` script. .. versionchanged:: 3.1 @@ -58,6 +58,9 @@ Features and minimum versions required to build CPython: .. versionchanged:: 3.13 Autoconf 2.71, aclocal 1.16.5 and SQLite 3.15.2 are now required. +.. versionchanged:: next + Autoconf 2.72 is now required. + See also :pep:`7` "Style Guide for C Code" and :pep:`11` "CPython platform support". diff --git a/configure.ac b/configure.ac index 9e131ed1a2dc98..1def41176337e3 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl ************************************************************ dnl * Please run autoreconf -ivf -Werror to test your changes! * dnl ************************************************************ dnl -dnl Python's configure script requires autoconf 2.71, autoconf-archive, +dnl Python's configure script requires autoconf 2.72, autoconf-archive, dnl aclocal 1.16, and pkg-config. dnl dnl It is recommended to use the Tools/build/regen-configure.sh shell script @@ -12,7 +12,7 @@ dnl # Set VERSION so we only need to edit in one place (i.e., here) m4_define([PYTHON_VERSION], [3.14]) -AC_PREREQ([2.71]) +AC_PREREQ([2.72]) AC_INIT([python],[PYTHON_VERSION],[https://github.com/python/cpython/issues…

1 0

[3.13] gh-127553: Remove outdated TODO comment in _pydatetime (GH-127564) (#128500)
by erlend-aasland 04 Jan '25

04 Jan '25

https://github.com/python/cpython/commit/b2bacbbea3e770b61ecedc058a63c7c97a… commit: b2bacbbea3e770b61ecedc058a63c7c97a7f4851 branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: erlend-aasland <erlend.aasland(a)protonmail.com> date: 2025-01-04T23:01:03Z summary: [3.13] gh-127553: Remove outdated TODO comment in _pydatetime (GH-127564) (#128500) (cherry picked from commit e8b6b39ff707378da654e15ccddde9c28cefdd30) Co-authored-by: Beomsoo Kim <beoms424(a)gmail.com> files: M Lib/_pydatetime.py diff --git a/Lib/_pydatetime.py b/Lib/_pydatetime.py index 34ccb2da13d0f3..e001bd3bbba4b7 100644 --- a/Lib/_pydatetime.py +++ b/Lib/_pydatetime.py @@ -2306,7 +2306,6 @@ def __reduce__(self): def _isoweek1monday(year): # Helper to calculate the day number of the Monday starting week 1 - # XXX This could be done more efficiently THURSDAY = 3 firstday = _ymd2ord(year, 1, 1) firstweekday = (firstday + 6) % 7 # See weekday() above

1 0

[3.12] gh-127553: Remove outdated TODO comment in _pydatetime (GH-127564) (#128501)
by erlend-aasland 04 Jan '25

04 Jan '25

https://github.com/python/cpython/commit/06e4173393664904dc6e0d219837b2cb8a… commit: 06e4173393664904dc6e0d219837b2cb8a0dadf7 branch: 3.12 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: erlend-aasland <erlend.aasland(a)protonmail.com> date: 2025-01-04T22:55:24Z summary: [3.12] gh-127553: Remove outdated TODO comment in _pydatetime (GH-127564) (#128501) (cherry picked from commit e8b6b39ff707378da654e15ccddde9c28cefdd30) Co-authored-by: Beomsoo Kim <beoms424(a)gmail.com> files: M Lib/_pydatetime.py diff --git a/Lib/_pydatetime.py b/Lib/_pydatetime.py index ad6292e1e412c4..fc43cf0bba32da 100644 --- a/Lib/_pydatetime.py +++ b/Lib/_pydatetime.py @@ -2313,7 +2313,6 @@ def __reduce__(self): def _isoweek1monday(year): # Helper to calculate the day number of the Monday starting week 1 - # XXX This could be done more efficiently THURSDAY = 3 firstday = _ymd2ord(year, 1, 1) firstweekday = (firstday + 6) % 7 # See weekday() above

1 0

gh-127553: Remove outdated TODO comment in _pydatetime (#127564)
by erlend-aasland 04 Jan '25

04 Jan '25

https://github.com/python/cpython/commit/e8b6b39ff707378da654e15ccddde9c28c… commit: e8b6b39ff707378da654e15ccddde9c28cefdd30 branch: main author: Beomsoo Kim <beoms424(a)gmail.com> committer: erlend-aasland <erlend.aasland(a)protonmail.com> date: 2025-01-04T23:38:49+01:00 summary: gh-127553: Remove outdated TODO comment in _pydatetime (#127564) files: M Lib/_pydatetime.py diff --git a/Lib/_pydatetime.py b/Lib/_pydatetime.py index ed01670cfece43..be90c9b1315d53 100644 --- a/Lib/_pydatetime.py +++ b/Lib/_pydatetime.py @@ -2392,7 +2392,6 @@ def __reduce__(self): def _isoweek1monday(year): # Helper to calculate the day number of the Monday starting week 1 - # XXX This could be done more efficiently THURSDAY = 3 firstday = _ymd2ord(year, 1, 1) firstweekday = (firstday + 6) % 7 # See weekday() above

1 0

[3.12] gh-127954: Document PyObject_DelItemString (GH-127986) (#128497)
by erlend-aasland 04 Jan '25

04 Jan '25

https://github.com/python/cpython/commit/e1a20910dc6857df558bb9fb7e49c75405… commit: e1a20910dc6857df558bb9fb7e49c75405b09f06 branch: 3.12 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: erlend-aasland <erlend.aasland(a)protonmail.com> date: 2025-01-04T20:54:56Z summary: [3.12] gh-127954: Document PyObject_DelItemString (GH-127986) (#128497) (cherry picked from commit 8ade15343d5daec3bf79ff7c47f03726fb2bcadf) Co-authored-by: RUANG (James Roy) <rruuaanng(a)outlook.com> files: M Doc/c-api/object.rst diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst index cefd384fd35a1f..b7f1a54972e587 100644 --- a/Doc/c-api/object.rst +++ b/Doc/c-api/object.rst @@ -393,6 +393,13 @@ Object Protocol on failure. This is equivalent to the Python statement ``del o[key]``. +.. c:function:: int PyObject_DelItemString(PyObject *o, const char *key) + + This is the same as :c:func:`PyObject_DelItem`, but *key* is + specified as a :c:expr:`const char*` UTF-8 encoded bytes string, + rather than a :c:expr:`PyObject*`. + + .. c:function:: PyObject* PyObject_Dir(PyObject *o) This is equivalent to the Python expression ``dir(o)``, returning a (possibly

1 0

[3.13] gh-127954: Document PyObject_DelItemString (GH-127986) (#128496)
by erlend-aasland 04 Jan '25

04 Jan '25

https://github.com/python/cpython/commit/5ed2b7649e47a8a22bb161c5107d9de96c… commit: 5ed2b7649e47a8a22bb161c5107d9de96c99b091 branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: erlend-aasland <erlend.aasland(a)protonmail.com> date: 2025-01-04T20:53:30Z summary: [3.13] gh-127954: Document PyObject_DelItemString (GH-127986) (#128496) (cherry picked from commit 8ade15343d5daec3bf79ff7c47f03726fb2bcadf) Co-authored-by: RUANG (James Roy) <rruuaanng(a)outlook.com> files: M Doc/c-api/object.rst diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst index ce6cb0496139f7..8bb392af01fcd2 100644 --- a/Doc/c-api/object.rst +++ b/Doc/c-api/object.rst @@ -493,6 +493,13 @@ Object Protocol on failure. This is equivalent to the Python statement ``del o[key]``. +.. c:function:: int PyObject_DelItemString(PyObject *o, const char *key) + + This is the same as :c:func:`PyObject_DelItem`, but *key* is + specified as a :c:expr:`const char*` UTF-8 encoded bytes string, + rather than a :c:expr:`PyObject*`. + + .. c:function:: PyObject* PyObject_Dir(PyObject *o) This is equivalent to the Python expression ``dir(o)``, returning a (possibly

1 0

gh-127954: Document PyObject_DelItemString (#127986)
by erlend-aasland 04 Jan '25

04 Jan '25

https://github.com/python/cpython/commit/8ade15343d5daec3bf79ff7c47f03726fb… commit: 8ade15343d5daec3bf79ff7c47f03726fb2bcadf branch: main author: RUANG (James Roy) <rruuaanng(a)outlook.com> committer: erlend-aasland <erlend.aasland(a)protonmail.com> date: 2025-01-04T21:48:20+01:00 summary: gh-127954: Document PyObject_DelItemString (#127986) files: M Doc/c-api/object.rst diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst index a137688fe07545..3a434a4173eafa 100644 --- a/Doc/c-api/object.rst +++ b/Doc/c-api/object.rst @@ -493,6 +493,13 @@ Object Protocol on failure. This is equivalent to the Python statement ``del o[key]``. +.. c:function:: int PyObject_DelItemString(PyObject *o, const char *key) + + This is the same as :c:func:`PyObject_DelItem`, but *key* is + specified as a :c:expr:`const char*` UTF-8 encoded bytes string, + rather than a :c:expr:`PyObject*`. + + .. c:function:: PyObject* PyObject_Dir(PyObject *o) This is equivalent to the Python expression ``dir(o)``, returning a (possibly

1 0

[3.12] Docs: amend json.dump() post gh-128482 (GH-128489) (#128494)
by erlend-aasland 04 Jan '25

04 Jan '25

https://github.com/python/cpython/commit/e3e4852fe08a158b4e5ec7a98516fba825… commit: e3e4852fe08a158b4e5ec7a98516fba82598d9dd branch: 3.12 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: erlend-aasland <erlend.aasland(a)protonmail.com> date: 2025-01-04T19:04:13Z summary: [3.12] Docs: amend json.dump() post gh-128482 (GH-128489) (#128494) (cherry picked from commit 87ee76062a7eb9c0fa2b94e36cfed21d86ae90ac) Co-authored-by: Erlend E. Aasland <erlend(a)python.org> files: M Doc/library/json.rst diff --git a/Doc/library/json.rst b/Doc/library/json.rst index aa33b175659b56..eff8808a440528 100644 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -143,10 +143,6 @@ Basic Usage :term:`file-like object`) using this :ref:`Python-to-JSON conversion table <py-to-json-table>`. - To use a custom :class:`JSONEncoder` subclass (for example, one that overrides the - :meth:`~JSONEncoder.default` method to serialize additional types), specify it with the - *cls* keyword argument; otherwise :class:`JSONEncoder` is used. - .. note:: Unlike :mod:`pickle` and :mod:`marshal`, JSON is not a framed protocol, @@ -186,6 +182,13 @@ Basic Usage If ``True`` (the default), their JavaScript equivalents (``NaN``, ``Infinity``, ``-Infinity``) are used. + :param cls: + If set, a custom JSON encoder with the + :meth:`~JSONEncoder.default` method overridden, + for serializing into custom datatypes. + If ``None`` (the default), :class:`!JSONEncoder` is used. + :type cls: a :class:`JSONEncoder` subclass + :param indent: If a positive integer or string, JSON array elements and object members will be pretty-printed with that indent level. @@ -212,7 +215,7 @@ Basic Usage If ``None`` (the default), :exc:`!TypeError` is raised. :type default: :term:`callable` | None - :param sort_keys: + :param bool sort_keys: If ``True``, dictionaries will be outputted sorted by key. Default ``False``.

1 0

[3.13] Docs: amend json.dump() post gh-128482 (GH-128489) (#128493)
by erlend-aasland 04 Jan '25

04 Jan '25

https://github.com/python/cpython/commit/62b4ca0d53f7b273e42b55c5307d46be33… commit: 62b4ca0d53f7b273e42b55c5307d46be33596b35 branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: erlend-aasland <erlend.aasland(a)protonmail.com> date: 2025-01-04T19:03:01Z summary: [3.13] Docs: amend json.dump() post gh-128482 (GH-128489) (#128493) (cherry picked from commit 87ee76062a7eb9c0fa2b94e36cfed21d86ae90ac) Co-authored-by: Erlend E. Aasland <erlend(a)python.org> files: M Doc/library/json.rst diff --git a/Doc/library/json.rst b/Doc/library/json.rst index ce0e652ee58f7f..21f36cb38f1193 100644 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -154,10 +154,6 @@ Basic Usage :term:`file-like object`) using this :ref:`Python-to-JSON conversion table <py-to-json-table>`. - To use a custom :class:`JSONEncoder` subclass (for example, one that overrides the - :meth:`~JSONEncoder.default` method to serialize additional types), specify it with the - *cls* keyword argument; otherwise :class:`JSONEncoder` is used. - .. note:: Unlike :mod:`pickle` and :mod:`marshal`, JSON is not a framed protocol, @@ -197,6 +193,13 @@ Basic Usage If ``True`` (the default), their JavaScript equivalents (``NaN``, ``Infinity``, ``-Infinity``) are used. + :param cls: + If set, a custom JSON encoder with the + :meth:`~JSONEncoder.default` method overridden, + for serializing into custom datatypes. + If ``None`` (the default), :class:`!JSONEncoder` is used. + :type cls: a :class:`JSONEncoder` subclass + :param indent: If a positive integer or string, JSON array elements and object members will be pretty-printed with that indent level. @@ -223,7 +226,7 @@ Basic Usage If ``None`` (the default), :exc:`!TypeError` is raised. :type default: :term:`callable` | None - :param sort_keys: + :param bool sort_keys: If ``True``, dictionaries will be outputted sorted by key. Default ``False``.

1 0