Mailman 3 March 2025 - Python-checkins

[3.13] Fix grammar typo in `Doc/c-api/arg.rst` (GH-130741) (#130759)
by hugovk March 2, 2025

March 2, 2025

https://github.com/python/cpython/commit/9854566626f6d79bf1c640d6893db85510… commit: 9854566626f6d79bf1c640d6893db8551056538d branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: hugovk <1324225+hugovk(a)users.noreply.github.com> date: 2025-03-02T13:14:29+02:00 summary: [3.13] Fix grammar typo in `Doc/c-api/arg.rst` (GH-130741) (#130759) Fix grammar typo in `Doc/c-api/arg.rst` (GH-130741) (cherry picked from commit 37145cb89fe806377a5e9ed1fdac92dd3a5df2c0) Co-authored-by: Arijit Kumar Das <arijitkrdas2004(a)outlook.com> files: M Doc/c-api/arg.rst diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst index 209056ef2f8bce..15402a4c48f569 100644 --- a/Doc/c-api/arg.rst +++ b/Doc/c-api/arg.rst @@ -5,7 +5,7 @@ Parsing arguments and building values ===================================== -These functions are useful when creating your own extensions functions and +These functions are useful when creating your own extension functions and methods. Additional information and examples are available in :ref:`extending-index`.

1 0

[3.12] Add link in the `importlib.metadata.version()` docs (GH-130739) (#130760)
by picnixz March 2, 2025

March 2, 2025

https://github.com/python/cpython/commit/257240e7239264b89916c76fb75c6f5f04… commit: 257240e7239264b89916c76fb75c6f5f04e189cc branch: 3.12 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: picnixz <10796600+picnixz(a)users.noreply.github.com> date: 2025-03-02T10:43:06Z summary: [3.12] Add link in the `importlib.metadata.version()` docs (GH-130739) (#130760) Add link in the `importlib.metadata.version()` docs (GH-130739) Link the specification for the returned data makes it clearer what this is and what the format of the version string can be. (cherry picked from commit c71e55869e7bc56b2bd04f3055f810026a66c076) Co-authored-by: Tim Hoffmann <2836374+timhoffm(a)users.noreply.github.com> files: M Doc/library/importlib.metadata.rst diff --git a/Doc/library/importlib.metadata.rst b/Doc/library/importlib.metadata.rst index 4b9b4ca939fc11..5dcaabba9f1661 100644 --- a/Doc/library/importlib.metadata.rst +++ b/Doc/library/importlib.metadata.rst @@ -266,8 +266,9 @@ Distribution versions .. function:: version(distribution_name) - Return the installed distribution package version for the named - distribution package. + Return the installed distribution package + `version <https://packaging.python.org/en/latest/specifications/core-metadata/#version>`__ + for the named distribution package. Raises :exc:`PackageNotFoundError` if the named distribution package is not installed in the current Python environment.

1 0

[3.13] Add link in the `importlib.metadata.version()` docs (GH-130739) (#130761)
by picnixz March 2, 2025

March 2, 2025

https://github.com/python/cpython/commit/ff14c1e7a9c936d88a545c858b7b09d85d… commit: ff14c1e7a9c936d88a545c858b7b09d85d6f7b72 branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: picnixz <10796600+picnixz(a)users.noreply.github.com> date: 2025-03-02T10:42:15Z summary: [3.13] Add link in the `importlib.metadata.version()` docs (GH-130739) (#130761) Add link in the `importlib.metadata.version()` docs (GH-130739) Link the specification for the returned data makes it clearer what this is and what the format of the version string can be. (cherry picked from commit c71e55869e7bc56b2bd04f3055f810026a66c076) Co-authored-by: Tim Hoffmann <2836374+timhoffm(a)users.noreply.github.com> files: M Doc/library/importlib.metadata.rst diff --git a/Doc/library/importlib.metadata.rst b/Doc/library/importlib.metadata.rst index 87f40301a9953d..1433da3fad869e 100644 --- a/Doc/library/importlib.metadata.rst +++ b/Doc/library/importlib.metadata.rst @@ -268,8 +268,9 @@ Distribution versions .. function:: version(distribution_name) - Return the installed distribution package version for the named - distribution package. + Return the installed distribution package + `version <https://packaging.python.org/en/latest/specifications/core-metadata/#version>`__ + for the named distribution package. Raises :exc:`PackageNotFoundError` if the named distribution package is not installed in the current Python environment.

1 0

gh-130740: Move some `stdbool.h` includes after `Python.h` (#130738)
by picnixz March 2, 2025

March 2, 2025

https://github.com/python/cpython/commit/214562ed4ddc248b007f718ed92ebcc0c3… commit: 214562ed4ddc248b007f718ed92ebcc0c3669611 branch: main author: Hugo Beauzée-Luyssen <hugo(a)beauzee.fr> committer: picnixz <10796600+picnixz(a)users.noreply.github.com> date: 2025-03-02T09:56:49Z summary: gh-130740: Move some `stdbool.h` includes after `Python.h` (#130738) Move some `#include <stdbool.h>` after `#include "Python.h"` when `pyconfig.h` is not included first and when we are in a platform-agnostic context. This is to avoid having features defined by `stdbool.h` before those decided by `Python.h`. files: A Misc/NEWS.d/next/Build/2025-03-01-18-27-42.gh-issue-130740.nDFSHR.rst M Modules/_hashopenssl.c M Parser/string_parser.c M Python/codegen.c M Python/flowgraph.c M Python/index_pool.c M Python/instruction_sequence.c diff --git a/Misc/NEWS.d/next/Build/2025-03-01-18-27-42.gh-issue-130740.nDFSHR.rst b/Misc/NEWS.d/next/Build/2025-03-01-18-27-42.gh-issue-130740.nDFSHR.rst new file mode 100644 index 00000000000000..61d416c69f0c30 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2025-03-01-18-27-42.gh-issue-130740.nDFSHR.rst @@ -0,0 +1,2 @@ +Ensure that ``Python.h`` is included before ``stdbool.h`` unless ``pyconfig.h`` +is included before or in some platform-specific contexts. diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c index 3f1deb81c6375f..f66b182b1deb6a 100644 --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -22,7 +22,6 @@ # define Py_BUILD_CORE_MODULE 1 #endif -#include <stdbool.h> #include "Python.h" #include "pycore_hashtable.h" #include "pycore_strhex.h" // _Py_strhex() @@ -37,6 +36,7 @@ #include <openssl/objects.h> #include <openssl/err.h> +#include <stdbool.h> #ifndef OPENSSL_THREADS # error "OPENSSL_THREADS is not defined, Python requires thread-safe OpenSSL" diff --git a/Parser/string_parser.c b/Parser/string_parser.c index b93300b00a8545..9b557e94d00431 100644 --- a/Parser/string_parser.c +++ b/Parser/string_parser.c @@ -1,5 +1,3 @@ -#include <stdbool.h> - #include <Python.h> #include "pycore_bytesobject.h" // _PyBytes_DecodeEscape() #include "pycore_unicodeobject.h" // _PyUnicode_DecodeUnicodeEscapeInternal() @@ -8,6 +6,8 @@ #include "pegen.h" #include "string_parser.h" +#include <stdbool.h> + //// STRING HANDLING FUNCTIONS //// static int diff --git a/Python/codegen.c b/Python/codegen.c index ecad8c22bdf51e..8f1a2983007ce4 100644 --- a/Python/codegen.c +++ b/Python/codegen.c @@ -12,8 +12,6 @@ * objects. */ -#include <stdbool.h> - #include "Python.h" #include "opcode.h" #include "pycore_ast.h" // _PyAST_GetDocString() @@ -32,6 +30,8 @@ #include "pycore_opcode_metadata.h" // _PyOpcode_opcode_metadata, _PyOpcode_num_popped/pushed #undef NEED_OPCODE_METADATA +#include <stdbool.h> + #define COMP_GENEXP 0 #define COMP_LISTCOMP 1 #define COMP_SETCOMP 2 diff --git a/Python/flowgraph.c b/Python/flowgraph.c index c5bdf105545459..fb3c73a059a589 100644 --- a/Python/flowgraph.c +++ b/Python/flowgraph.c @@ -1,6 +1,3 @@ - -#include <stdbool.h> - #include "Python.h" #include "opcode.h" #include "pycore_flowgraph.h" @@ -12,6 +9,8 @@ #include "pycore_opcode_utils.h" #include "pycore_opcode_metadata.h" // OPCODE_HAS_ARG, etc +#include <stdbool.h> + #undef SUCCESS #undef ERROR diff --git a/Python/index_pool.c b/Python/index_pool.c index 526eccff74af00..007c81a0fc16ec 100644 --- a/Python/index_pool.c +++ b/Python/index_pool.c @@ -1,10 +1,10 @@ -#include <stdbool.h> - #include "Python.h" #include "pycore_index_pool.h" #include "pycore_lock.h" +#include <stdbool.h> + #ifdef Py_GIL_DISABLED static inline void diff --git a/Python/instruction_sequence.c b/Python/instruction_sequence.c index e2607e98095ed2..ed40c06715f1f3 100644 --- a/Python/instruction_sequence.c +++ b/Python/instruction_sequence.c @@ -5,8 +5,6 @@ */ -#include <stdbool.h> - #include "Python.h" #include "pycore_compile.h" // _PyCompile_EnsureArrayLargeEnough @@ -22,6 +20,8 @@ typedef _Py_SourceLocation location; #include "clinic/instruction_sequence.c.h" +#include <stdbool.h> + #undef SUCCESS #undef ERROR #define SUCCESS 0

1 0

[3.12] gh-128481: Improve documentation for `traceback.FrameSummary` (GH-128484) (#130754)
by picnixz March 2, 2025

March 2, 2025

https://github.com/python/cpython/commit/a0676db61efd08ff9cefc878dd47c007c9… commit: a0676db61efd08ff9cefc878dd47c007c9793a8f branch: 3.12 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: picnixz <10796600+picnixz(a)users.noreply.github.com> date: 2025-03-02T09:50:32Z summary: [3.12] gh-128481: Improve documentation for `traceback.FrameSummary` (GH-128484) (#130754) * gh-128481: Improve documentation for `traceback.FrameSummary` (GH-128484) Complete the `traceback.FrameSummary` signature and add missing documentation for the `colno` and `end_{col,line}no` attributes. (cherry picked from commit 051f0e5683fec3840fa7fc99723741dd2d701eae) Co-authored-by: Damien <81557462+Damien-Chen(a)users.noreply.github.com> files: M Doc/library/traceback.rst diff --git a/Doc/library/traceback.rst b/Doc/library/traceback.rst index d7e9dadf9ca2e2..89b7d024f68784 100644 --- a/Doc/library/traceback.rst +++ b/Doc/library/traceback.rst @@ -478,7 +478,9 @@ the module-level functions described above. A :class:`!FrameSummary` object represents a single :ref:`frame <frame-objects>` in a :ref:`traceback <traceback-objects>`. -.. class:: FrameSummary(filename, lineno, name, lookup_line=True, locals=None, line=None) +.. class:: FrameSummary(filename, lineno, name, *,\ + lookup_line=True, locals=None,\ + line=None, end_lineno=None, colno=None, end_colno=None) Represents a single :ref:`frame <frame-objects>` in the :ref:`traceback <traceback-objects>` or stack that is being formatted @@ -514,6 +516,22 @@ in a :ref:`traceback <traceback-objects>`. trailing whitespace stripped. If the source is not available, it is ``None``. + .. attribute:: FrameSummary.end_lineno + + The last line number of the source code for this frame. + By default, it is set to ``None`` and indexation starts from 1. + + .. attribute:: FrameSummary.colno + + The column number of the source code for this frame. + By default, it is ``None`` and indexation starts from 0. + + .. attribute:: FrameSummary.end_colno + + The last column number of the source code for this frame. + By default, it is ``None`` and indexation starts from 0. + + .. _traceback-example: Examples of Using the Module-Level Functions

1 0

[3.13] gh-128481: Improve documentation for `traceback.FrameSummary` (GH-128484) (#130753)
by picnixz March 2, 2025

March 2, 2025

https://github.com/python/cpython/commit/dca599eaad5fcbbc58de027549cbc0748c… commit: dca599eaad5fcbbc58de027549cbc0748cf7f526 branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: picnixz <10796600+picnixz(a)users.noreply.github.com> date: 2025-03-02T09:48:30Z summary: [3.13] gh-128481: Improve documentation for `traceback.FrameSummary` (GH-128484) (#130753) * gh-128481: Improve documentation for `traceback.FrameSummary` (GH-128484) Complete the `traceback.FrameSummary` signature and add missing documentation for the `colno` and `end_{col,line}no` attributes. (cherry picked from commit 051f0e5683fec3840fa7fc99723741dd2d701eae) Co-authored-by: Damien <81557462+Damien-Chen(a)users.noreply.github.com> files: M Doc/library/traceback.rst diff --git a/Doc/library/traceback.rst b/Doc/library/traceback.rst index 3beeb49755b533..ebd691a363959a 100644 --- a/Doc/library/traceback.rst +++ b/Doc/library/traceback.rst @@ -499,7 +499,9 @@ the module-level functions described above. A :class:`!FrameSummary` object represents a single :ref:`frame <frame-objects>` in a :ref:`traceback <traceback-objects>`. -.. class:: FrameSummary(filename, lineno, name, lookup_line=True, locals=None, line=None) +.. class:: FrameSummary(filename, lineno, name, *,\ + lookup_line=True, locals=None,\ + line=None, end_lineno=None, colno=None, end_colno=None) Represents a single :ref:`frame <frame-objects>` in the :ref:`traceback <traceback-objects>` or stack that is being formatted @@ -535,6 +537,22 @@ in a :ref:`traceback <traceback-objects>`. trailing whitespace stripped. If the source is not available, it is ``None``. + .. attribute:: FrameSummary.end_lineno + + The last line number of the source code for this frame. + By default, it is set to ``lineno`` and indexation starts from 1. + + .. attribute:: FrameSummary.colno + + The column number of the source code for this frame. + By default, it is ``None`` and indexation starts from 0. + + .. attribute:: FrameSummary.end_colno + + The last column number of the source code for this frame. + By default, it is ``None`` and indexation starts from 0. + + .. _traceback-example: Examples of Using the Module-Level Functions

1 0

gh-128481: Improve documentation for `traceback.FrameSummary` (#128484)
by picnixz March 2, 2025

March 2, 2025

https://github.com/python/cpython/commit/051f0e5683fec3840fa7fc99723741dd2d… commit: 051f0e5683fec3840fa7fc99723741dd2d701eae branch: main author: Damien <81557462+Damien-Chen(a)users.noreply.github.com> committer: picnixz <10796600+picnixz(a)users.noreply.github.com> date: 2025-03-02T10:29:12+01:00 summary: gh-128481: Improve documentation for `traceback.FrameSummary` (#128484) Complete the `traceback.FrameSummary` signature and add missing documentation for the `colno` and `end_{col,line}no` attributes. files: M Doc/library/traceback.rst diff --git a/Doc/library/traceback.rst b/Doc/library/traceback.rst index 3475b014634d58..757fdf601cd0fe 100644 --- a/Doc/library/traceback.rst +++ b/Doc/library/traceback.rst @@ -508,7 +508,9 @@ the module-level functions described above. A :class:`!FrameSummary` object represents a single :ref:`frame <frame-objects>` in a :ref:`traceback <traceback-objects>`. -.. class:: FrameSummary(filename, lineno, name, lookup_line=True, locals=None, line=None) +.. class:: FrameSummary(filename, lineno, name, *,\ + lookup_line=True, locals=None,\ + line=None, end_lineno=None, colno=None, end_colno=None) Represents a single :ref:`frame <frame-objects>` in the :ref:`traceback <traceback-objects>` or stack that is being formatted @@ -544,6 +546,22 @@ in a :ref:`traceback <traceback-objects>`. trailing whitespace stripped. If the source is not available, it is ``None``. + .. attribute:: FrameSummary.end_lineno + + The last line number of the source code for this frame. + By default, it is set to ``lineno`` and indexation starts from 1. + + .. attribute:: FrameSummary.colno + + The column number of the source code for this frame. + By default, it is ``None`` and indexation starts from 0. + + .. attribute:: FrameSummary.end_colno + + The last column number of the source code for this frame. + By default, it is ``None`` and indexation starts from 0. + + .. _traceback-example: Examples of Using the Module-Level Functions

1 0

Fix grammar typo in `Doc/c-api/arg.rst` (#130741)
by picnixz March 2, 2025

March 2, 2025

https://github.com/python/cpython/commit/37145cb89fe806377a5e9ed1fdac92dd3a… commit: 37145cb89fe806377a5e9ed1fdac92dd3a5df2c0 branch: main author: Arijit Kumar Das <arijitkrdas2004(a)outlook.com> committer: picnixz <10796600+picnixz(a)users.noreply.github.com> date: 2025-03-02T10:24:34+01:00 summary: Fix grammar typo in `Doc/c-api/arg.rst` (#130741) files: M Doc/c-api/arg.rst diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst index deebaba1952999..66ccf3c96a65a4 100644 --- a/Doc/c-api/arg.rst +++ b/Doc/c-api/arg.rst @@ -5,7 +5,7 @@ Parsing arguments and building values ===================================== -These functions are useful when creating your own extensions functions and +These functions are useful when creating your own extension functions and methods. Additional information and examples are available in :ref:`extending-index`.

1 0

Add link in the `importlib.metadata.version()` docs (#130739)
by picnixz March 2, 2025

March 2, 2025

https://github.com/python/cpython/commit/c71e55869e7bc56b2bd04f3055f810026a… commit: c71e55869e7bc56b2bd04f3055f810026a66c076 branch: main author: Tim Hoffmann <2836374+timhoffm(a)users.noreply.github.com> committer: picnixz <10796600+picnixz(a)users.noreply.github.com> date: 2025-03-02T10:23:32+01:00 summary: Add link in the `importlib.metadata.version()` docs (#130739) Link the specification for the returned data makes it clearer what this is and what the format of the version string can be. files: M Doc/library/importlib.metadata.rst diff --git a/Doc/library/importlib.metadata.rst b/Doc/library/importlib.metadata.rst index 45bf19ec29286d..67df24797135ca 100644 --- a/Doc/library/importlib.metadata.rst +++ b/Doc/library/importlib.metadata.rst @@ -268,8 +268,9 @@ Distribution versions .. function:: version(distribution_name) - Return the installed distribution package version for the named - distribution package. + Return the installed distribution package + `version <https://packaging.python.org/en/latest/specifications/core-metadata/#version>`__ + for the named distribution package. Raises :exc:`PackageNotFoundError` if the named distribution package is not installed in the current Python environment.

1 0

GH-127381: pathlib ABCs: remove `WritablePath.mkdir()` arguments (#130611)
by barneygale March 1, 2025

March 1, 2025

https://github.com/python/cpython/commit/c9932a9ec8a3077933a85101aae9c3ac15… commit: c9932a9ec8a3077933a85101aae9c3ac155e6d04 branch: main author: Barney Gale <barney.gale(a)gmail.com> committer: barneygale <barney.gale(a)gmail.com> date: 2025-03-01T21:25:38Z summary: GH-127381: pathlib ABCs: remove `WritablePath.mkdir()` arguments (#130611) Remove the *mode*, *parents* and *exist_ok* arguments from `WritablePath.mkdir()`. These arguments imply support for POSIX permissions and checking for preexistence of the path or its parents, but subclasses of `WritablePath` may not have these capabilities. The public `Path.mkdir()` method retains these arguments. files: M Lib/pathlib/_abc.py M Lib/test/test_pathlib/test_pathlib_abc.py diff --git a/Lib/pathlib/_abc.py b/Lib/pathlib/_abc.py index cb5af3230bfd67..d9fb018d75f538 100644 --- a/Lib/pathlib/_abc.py +++ b/Lib/pathlib/_abc.py @@ -352,7 +352,7 @@ def symlink_to(self, target, target_is_directory=False): raise NotImplementedError @abstractmethod - def mkdir(self, mode=0o777, parents=False, exist_ok=False): + def mkdir(self): """ Create a new directory at this given path. """ diff --git a/Lib/test/test_pathlib/test_pathlib_abc.py b/Lib/test/test_pathlib/test_pathlib_abc.py index efc6c17962e261..1c1797ff04f653 100644 --- a/Lib/test/test_pathlib/test_pathlib_abc.py +++ b/Lib/test/test_pathlib/test_pathlib_abc.py @@ -914,23 +914,17 @@ def __open_wb__(self, buffering=-1): self._directories[parent].add(name) return DummyWritablePathIO(self._files, path) - def mkdir(self, mode=0o777, parents=False, exist_ok=False): + def mkdir(self): path = str(self) parent = str(self.parent) if path in self._directories: - if exist_ok: - return - else: - raise FileExistsError(errno.EEXIST, "File exists", path) + raise FileExistsError(errno.EEXIST, "File exists", path) try: if self.name: self._directories[parent].add(self.name) self._directories[path] = set() except KeyError: - if not parents: - raise FileNotFoundError(errno.ENOENT, "File not found", parent) from None - self.parent.mkdir(parents=True, exist_ok=True) - self.mkdir(mode, parents=False, exist_ok=exist_ok) + raise FileNotFoundError(errno.ENOENT, "File not found", parent) from None def symlink_to(self, target, target_is_directory=False): raise NotImplementedError

1 0