Merge branch 'main' into gh-153668

Author: chris-eibl

.github/CODEOWNERS

@@ -290,9 +290,10 @@ Tools/jit/                    @brandtbucher @savannahostrowski @diegorusso
 InternalDocs/jit.md           @brandtbucher @savannahostrowski @diegorusso @AA-Turner
 
 # Lazy imports (PEP 810)
-Objects/lazyimportobject.c                  @yhg1s @DinoV @pablogsal
-Include/internal/pycore_lazyimportobject.h  @yhg1s @DinoV @pablogsal
-Lib/test/test_lazy_import                   @yhg1s @DinoV @pablogsal
+.github/workflows/reusable-test-lazy-imports-all.yml    @yhg1s @DinoV @pablogsal
+Objects/lazyimportobject.c                              @yhg1s @DinoV @pablogsal
+Include/internal/pycore_lazyimportobject.h              @yhg1s @DinoV @pablogsal
+Lib/test/test_lazy_import                               @yhg1s @DinoV @pablogsal
 
 # Micro-op / μop / Tier 2 Optimiser
 Python/optimizer.c            @markshannon @Fidget-Spinner
@@ -655,5 +656,8 @@ Objects/**/clinic/
 PC/**/clinic/
 Python/**/clinic/
 
+# Exclude Lazy Imports=all CI carve out file
+Lib/test/lazy_imports_all_exclude.txt
+
 # Exclude HTML IDs list
 Doc/tools/removed-ids.txt

.github/workflows/build.yml

@@ -476,6 +476,12 @@ jobs:
         name: hypothesis-example-db
         path: ${{ env.CPYTHON_BUILDDIR }}/.hypothesis/examples/
 
+  test-lazy-imports-all:
+    name: 'Lazy imports enabled'
+    needs: build-context
+    if: fromJSON(needs.build-context.outputs.run-tests)
+    uses: ./.github/workflows/reusable-test-lazy-imports-all.yml
+
   build-asan:
     name: 'Address sanitizer'
     runs-on: ${{ matrix.os }}
@@ -648,6 +654,7 @@ jobs:
     - build-emscripten
     - build-wasi
     - test-hypothesis
+    - test-lazy-imports-all
     - build-asan
     - build-san
     - cross-build-linux
@@ -705,4 +712,5 @@ jobs:
           ${{ !fromJSON(needs.build-context.outputs.run-ios) && 'build-ios,' || '' }}
           ${{ !fromJSON(needs.build-context.outputs.run-emscripten) && 'build-emscripten,' || '' }}
           ${{ !fromJSON(needs.build-context.outputs.run-wasi) && 'build-wasi,' || '' }}
+          ${{ !fromJSON(needs.build-context.outputs.run-tests) && 'test-lazy-imports-all,' || '' }}
         jobs: ${{ toJSON(needs) }}

.github/workflows/reusable-test-lazy-imports-all.yml

@@ -0,0 +1,79 @@
+name: Reusable Lazy Imports Tests
+
+# Run the CPython test suite with global lazy imports forced on
+# (``-X lazy_imports=all``).
+#
+# Modules that are known to fail under lazy imports are listed in
+# Lib/test/lazy_imports_all_exclude.txt and skipped here. Remove entries from
+# that file as the modules are fixed so this workflow starts guarding them
+# against regressions. Excluded modules are also checked separately so the
+# workflow fails when one starts passing and its exclusion should be removed.
+
+on:
+  workflow_call:
+
+permissions:
+  contents: read
+
+env:
+  FORCE_COLOR: 1
+
+jobs:
+  test-lazy-imports-all:
+    name: 'Run Tests with lazy_imports=all'
+    runs-on: ubuntu-26.04
+    timeout-minutes: 60
+    env:
+      EXCLUDE_FILE: Lib/test/lazy_imports_all_exclude.txt
+    steps:
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      with:
+        persist-credentials: false
+    - name: Register gcc problem matcher
+      run: echo "::add-matcher::.github/problem-matchers/gcc.json"
+    - name: Install dependencies
+      run: sudo ./.github/workflows/posix-deps-apt.sh
+    - name: Configure CPython
+      run: ./configure --config-cache --with-pydebug
+    - name: Build CPython
+      run: make -j4
+    - name: Display build info
+      run: make pythoninfo
+    - name: Verify lazy imports are fully enabled
+      run: ./python -X lazy_imports=all -c "import sys; assert sys.flags.lazy_imports == 1, sys.flags.lazy_imports; print('lazy imports all enabled')"
+    - name: Build test list (all tests minus the known-failing exclusions)
+      run: |
+        set -euo pipefail
+        ./python -m test --list-tests > all_tests.txt
+        # Strip comments/blank lines from the exclusion file, then drop those
+        # exact test names (whole-line, fixed-string match) from the run list.
+        grep -vE '^\s*(#.*)?$' "$EXCLUDE_FILE" > exclude_tests.txt || true
+        grep -vxF -f exclude_tests.txt all_tests.txt > run_tests.txt
+        # Fail loudly if any exclusion entry matched nothing: a stale or
+        # mistyped name (or a change in `--list-tests` output) would otherwise
+        # silently stop excluding a module and let it fail the run.
+        stale=$(comm -23 <(sort -u exclude_tests.txt) <(sort -u all_tests.txt))
+        if [ -n "$stale" ]; then
+          echo "::error::Stale entries in $EXCLUDE_FILE (no longer match 'python -m test --list-tests'); remove or fix them:"
+          echo "$stale"
+          exit 1
+        fi
+        echo "Excluding $(wc -l < exclude_tests.txt) module(s); running $(wc -l < run_tests.txt) of $(wc -l < all_tests.txt)."
+    - name: Run tests with lazy imports
+      run: xvfb-run xargs -a run_tests.txt ./python -X lazy_imports=all -m test --fast-ci --timeout=900 < /dev/null
+    - name: Verify excluded tests still need exclusion
+      run: |
+        set -euo pipefail
+        unexpected_passes=()
+        while IFS= read -r test_name; do
+          [ -n "$test_name" ] || continue
+          echo "Checking excluded test: $test_name"
+          if xvfb-run ./python -X lazy_imports=all -m test --fast-ci --timeout=900 "$test_name"; then
+            unexpected_passes+=("$test_name")
+          fi
+        done < exclude_tests.txt
+        if [ "${#unexpected_passes[@]}" -ne 0 ]; then
+          echo "::error::These tests still appear in $EXCLUDE_FILE but now pass with -X lazy_imports=all. Remove them from the exclude file:"
+          printf '%s\n' "${unexpected_passes[@]}"
+          exit 1
+        fi

Doc/Makefile

@@ -191,8 +191,8 @@ lock:
 # Dependencies have a 14 day cooldown period to mitigate supply chain attacks,
 # except for sphinx_linklint and python-docs-theme, which are maintained by
 # core team members.
-	uv pip compile requirements.txt \
-		--exclude-newer P14D \
+	$(UV) pip compile requirements.txt \
+		--upgrade --exclude-newer P14D \
 		--exclude-newer-package sphinx_linklint=PT0S \
 		--exclude-newer-package python-docs-theme=PT0S \
 		--no-cache --output-file $(REQUIREMENTS) \

Doc/c-api/unicode.rst

@@ -16,6 +16,13 @@ points must be below 1114112 (which is the full Unicode range).
 
 UTF-8 representation is created on demand and cached in the Unicode object.
 
+.. impl-detail::
+
+   The internal buffer always includes an extra trailing null character for
+   compatibility with null terminated C strings. This extra character is not
+   counted in :c:func:`PyUnicode_GetLength` nor in the various *size* arguments
+   of the functions below.
+
 .. note::
    The :c:type:`Py_UNICODE` representation has been removed since Python 3.12
    with deprecated APIs.
@@ -164,11 +171,15 @@ access to internal read-only data of Unicode objects:
    .. versionadded:: 3.3
 
 
-.. c:function:: Py_UCS4 PyUnicode_READ(int kind, void *data, \
-                                       Py_ssize_t index)
+.. c:function:: Py_UCS4 PyUnicode_READ(int kind, void *data, Py_ssize_t index)
 
    Read a code point from a canonical representation *data* (as obtained with
-   :c:func:`PyUnicode_DATA`).  No checks or ready calls are performed.
+   :c:func:`PyUnicode_DATA`).  No checks are performed.
+
+   .. impl-detail::
+
+      Accept reading the trailing null character at index
+      :c:func:`PyUnicode_GetLength`.
 
    .. versionadded:: 3.3
 
@@ -179,6 +190,11 @@ access to internal read-only data of Unicode objects:
    representation.  This is less efficient than :c:func:`PyUnicode_READ` if you
    do multiple consecutive reads.
 
+   .. impl-detail::
+
+      Accept reading the trailing null character at index
+      :c:func:`PyUnicode_GetLength`.
+
    .. versionadded:: 3.3
 
 
@@ -716,6 +732,10 @@ APIs:
 
    On error, set an exception and return ``-1``.
 
+   .. impl-detail::
+
+      The length does not count the trailing null character.
+
    .. versionadded:: 3.3
 
 
@@ -794,6 +814,11 @@ APIs:
 
    Return character on success, ``-1`` on error with an exception set.
 
+   .. impl-detail::
+
+      Do not accept reading the trailing null character at index
+      :c:func:`PyUnicode_GetLength`.
+
    .. versionadded:: 3.3
 
 

Doc/conf.py

@@ -636,3 +636,40 @@
     "library/threadsafety.rst": "builtins/threadsafety.rst",
     "library/time-complexity.rst": "builtins/time-complexity.rst",
 }
+
+# Refuse to run the doctest builder under a mismatched Python
+# -----------------------------------------------------------
+
+
+def _check_doctest_interpreter(app):
+    # The doctests are executed by the interpreter running Sphinx,
+    # so refuse to run them if its version doesn't match the source tree.
+    if app.builder.name != "doctest":
+        return
+
+    running_version = f"{sys.version_info.major}.{sys.version_info.minor}"
+    if running_version != version:
+        from sphinx.util import logging as sphinx_logging
+
+        logger = sphinx_logging.getLogger(__name__)
+        logger.error(
+            "The doctests are executed by the Python running Sphinx, "
+            "which is Python %s, however this source tree is Python %s, "
+            "so they would test Python %s rather than the code "
+            "documented here.\n"
+            "Recreate the venv with a matching interpreter, for example: "
+            "'make clean-venv && make venv PYTHON=../python'.",
+            running_version,
+            version,
+            running_version,
+        )
+        raise SystemExit(1)
+
+
+def setup(app):
+    app.connect("builder-inited", _check_doctest_interpreter)
+    return {
+        "version": "1.0",
+        "parallel_read_safe": True,
+        "parallel_write_safe": True,
+    }

Doc/library/ctypes.rst

@@ -3383,3 +3383,47 @@ Exceptions
    .. availability:: Windows
 
    .. versionadded:: 3.14
+
+
+Library version
+^^^^^^^^^^^^^^^
+
+The following constants are only available if :mod:`!ctypes` was built with
+libffi 3.5 or later, which is the first version providing this information.
+
+.. data:: LIBFFI_VERSION
+
+   The version string of the libffi library that was used for building
+   the module, like ``'3.5.2'``.
+   This may be different from the libffi library actually used at runtime,
+   which is available as :const:`libffi_version`.
+
+   .. versionadded:: next
+
+.. data:: libffi_version
+
+   The version string of the libffi library actually loaded by the interpreter.
+
+   .. versionadded:: next
+
+.. data:: LIBFFI_VERSION_INFO
+
+   A named tuple containing the three components of the libffi library
+   version that was used for building the module:
+   *major*, *minor*, and *patch*.
+   All values are integers.
+   The components can also be accessed by name,
+   so ``ctypes.LIBFFI_VERSION_INFO[0]`` is equivalent to
+   ``ctypes.LIBFFI_VERSION_INFO.major`` and so on.
+   This may be different from the libffi library actually used at runtime,
+   which is available as :const:`libffi_version_info`.
+
+   .. versionadded:: next
+
+.. data:: libffi_version_info
+
+   A named tuple containing the version of the libffi library
+   actually loaded by the interpreter,
+   with the same fields as :const:`LIBFFI_VERSION_INFO`.
+
+   .. versionadded:: next

Doc/library/ipaddress.rst

@@ -519,10 +519,10 @@ dictionaries.
       The interpretation is similar to an integer *address*.
 
    4. A two-tuple of an address description and a netmask, where the address
-      description is either a string, a 32-bits integer, a 4-bytes packed
-      integer, or an existing :class:`IPv4Address` object; and the netmask is either
-      an integer representing the prefix length (e.g. ``24``) or a string
-      representing the prefix mask (e.g. ``255.255.255.0``).
+      description is either a string, a 32-bit integer, a 4-byte packed
+      integer, or an existing :class:`IPv4Address` object; and the netmask is
+      either an integer representing the prefix length (e.g. ``24``) or a
+      string representing the prefix mask (e.g. ``255.255.255.0``).
 
    An :exc:`AddressValueError` is raised if *address* is not a valid IPv4
    address.  A :exc:`NetmaskValueError` is raised if the mask is not valid for
@@ -769,9 +769,9 @@ dictionaries.
       The interpretation is similar to an integer *address*.
 
    4. A two-tuple of an address description and a netmask, where the address
-      description is either a string, a 128-bits integer, a 16-bytes packed
-      integer, or an existing :class:`IPv6Address` object; and the netmask is an
-      integer representing the prefix length.
+      description is either a string, a 128-bit integer, a 16-byte packed
+      integer, or an existing :class:`IPv6Address` object; and the netmask is
+      an integer representing the prefix length.
 
    An :exc:`AddressValueError` is raised if *address* is not a valid IPv6
    address.  A :exc:`NetmaskValueError` is raised if the mask is not valid for

Doc/library/turtle.rst

@@ -2571,6 +2571,25 @@ Public classes
    * ``a.rotate(angle)`` rotation
 
 
+Exceptions
+==========
+
+The :mod:`!turtle` module defines the following exception:
+
+.. exception:: TurtleGraphicsError
+
+   Raised for invalid arguments or operations.
+   For example, a malformed color string:
+
+   .. doctest::
+      :skipif: _tkinter is None
+
+      >>> turtle.color("blau")
+      Traceback (most recent call last):
+          ...
+      turtle.TurtleGraphicsError: bad color string: blau
+
+
 .. _turtle-explanation:
 
 Explanation

Doc/library/uuid.rst

@@ -44,9 +44,10 @@ which relays any information about the UUID's safety, using this enumeration:
 
 .. class:: UUID(hex=None, bytes=None, bytes_le=None, fields=None, int=None, version=None, *, is_safe=SafeUUID.unknown)
 
-   Create a UUID from either a string of 32 hexadecimal digits, a string of 16
-   bytes in big-endian order as the *bytes* argument, a string of 16 bytes in
-   little-endian order as the *bytes_le* argument, a tuple of six integers
+   Create a UUID from either a string of 32 hexadecimal digits, a 16-byte
+   :class:`bytes` object in big-endian order as the *bytes* argument, a
+   16-byte :class:`bytes` object in little-endian order as the *bytes_le*
+   argument, a tuple of six integers
    (32-bit *time_low*, 16-bit *time_mid*, 16-bit *time_hi_version*,
    8-bit *clock_seq_hi_variant*, 8-bit *clock_seq_low*, 48-bit *node*) as the
    *fields* argument, or a single 128-bit integer as the *int* argument.
@@ -80,14 +81,14 @@ which relays any information about the UUID's safety, using this enumeration:
 
 .. attribute:: UUID.bytes
 
-   The UUID as a 16-byte string (containing the six integer fields in big-endian
-   byte order).
+   The UUID as a 16-byte :class:`bytes` object (containing the six integer
+   fields in big-endian byte order).
 
 
 .. attribute:: UUID.bytes_le
 
-   The UUID as a 16-byte string (with *time_low*, *time_mid*, and *time_hi_version*
-   in little-endian byte order).
+   The UUID as a 16-byte :class:`bytes` object (with *time_low*, *time_mid*,
+   and *time_hi_version* in little-endian byte order).
 
 
 .. attribute:: UUID.fields
@@ -435,7 +436,7 @@ Here are some examples of typical usage of the :mod:`!uuid` module::
    >>> x.bytes
    b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f'
 
-   >>> # make a UUID from a 16-byte string
+   >>> # make a UUID from a 16-byte bytes object
    >>> uuid.UUID(bytes=x.bytes)
    UUID('00010203-0405-0607-0809-0a0b0c0d0e0f')