Merge branch 'main' into unicodetata-bidis

# Conflicts:
#	Lib/test/test_unicodedata.py
#	Tools/unicode/makeunicodedata.py

Author: StanFromIreland

.github/CODEOWNERS

@@ -292,6 +292,12 @@ Python/jit.c                  @brandtbucher @savannahostrowski @diegorusso
 Tools/jit/                    @brandtbucher @savannahostrowski @diegorusso
 InternalDocs/jit.md           @brandtbucher @savannahostrowski @diegorusso @AA-Turner
 
+# Lazy imports (PEP 810)
+Objects/lazyimportobject.c                  @twouters @DinoV @pablogsal
+Include/internal/pycore_lazyimportobject.h  @twouters @DinoV @pablogsal
+Lib/test/test_import/test_lazy_imports.py   @twouters @DinoV @pablogsal
+Lib/test/test_import/data/lazy_imports/     @twouters @DinoV @pablogsal
+
 # Micro-op / μop / Tier 2 Optimiser
 Python/optimizer.c            @markshannon @Fidget-Spinner
 Python/optimizer_analysis.c   @markshannon @tomasr8 @Fidget-Spinner @savannahostrowski

.github/workflows/build.yml

@@ -242,11 +242,18 @@ jobs:
         # BOLT currently crashes during instrumentation on aarch64
         - os: ubuntu-24.04-arm
           bolt: true
+        include:
+        # Enable CPU-intensive tests on ARM (default build only)
+        - os: ubuntu-24.04-arm
+          bolt: false
+          free-threading: false
+          test-opts: '-u cpu'
     uses: ./.github/workflows/reusable-ubuntu.yml
     with:
       bolt-optimizations: ${{ matrix.bolt }}
       free-threading: ${{ matrix.free-threading }}
       os: ${{ matrix.os }}
+      test-opts: ${{ matrix.test-opts || '' }}
 
   build-ubuntu-ssltests-openssl:
     name: 'Ubuntu SSL tests with OpenSSL'

.github/workflows/reusable-ubuntu.yml

@@ -17,6 +17,11 @@ on:
          description: OS to run the job
          required: true
          type: string
+      test-opts:
+         description: Extra options to pass to the test runner via TESTOPTS
+         required: false
+         type: string
+         default: ''
 
 env:
   FORCE_COLOR: 1
@@ -111,4 +116,6 @@ jobs:
       run: sudo mount "$CPYTHON_RO_SRCDIR" -oremount,rw
     - name: Tests
       working-directory: ${{ env.CPYTHON_BUILDDIR }}
-      run: xvfb-run make ci
+      run: xvfb-run make ci EXTRATESTOPTS="${TEST_OPTS}"
+      env:
+        TEST_OPTS: ${{ inputs.test-opts }}

Android/android.py

@@ -208,7 +208,7 @@ def make_build_python(context):
 def unpack_deps(host, prefix_dir):
     os.chdir(prefix_dir)
     deps_url = "https://github.com/beeware/cpython-android-source-deps/releases/download"
-    for name_ver in ["bzip2-1.0.8-3", "libffi-3.4.4-3", "openssl-3.0.18-0",
+    for name_ver in ["bzip2-1.0.8-3", "libffi-3.4.4-3", "openssl-3.0.19-1",
                      "sqlite-3.50.4-0", "xz-5.4.6-1", "zstd-1.5.7-1"]:
         filename = f"{name_ver}-{host}.tar.gz"
         download(f"{deps_url}/{name_ver}/{filename}")

Apple/__main__.py

@@ -316,7 +316,7 @@ def unpack_deps(
     for name_ver in [
         "BZip2-1.0.8-2",
         "libFFI-3.4.7-2",
-        "OpenSSL-3.0.18-1",
+        "OpenSSL-3.0.19-1",
         "XZ-5.6.4-2",
         "mpdecimal-4.0.0-2",
         "zstd-1.5.7-1",

Doc/c-api/datetime.rst

@@ -30,6 +30,10 @@ macros.
 
       This is not compatible with subinterpreters.
 
+   .. versionchanged:: 3.15
+
+      This macro is now thread safe.
+
 .. c:type:: PyDateTime_CAPI
 
    Structure containing the fields for the datetime C API.
@@ -44,6 +48,11 @@ macros.
 
    This variable is only available once :c:macro:`PyDateTime_IMPORT` succeeds.
 
+   .. versionchanged:: 3.15
+
+      This variable should not be accessed directly as direct access is not thread-safe.
+      Use :c:func:`PyDateTime_IMPORT` instead.
+
 .. c:type:: PyDateTime_Date
 
    This subtype of :c:type:`PyObject` represents a Python date object.

Doc/c-api/dict.rst

@@ -2,7 +2,7 @@
 
 .. _dictobjects:
 
-Dictionary Objects
+Dictionary objects
 ------------------
 
 .. index:: pair: object; dictionary
@@ -444,7 +444,7 @@ Dictionary Objects
    .. versionadded:: 3.12
 
 
-Dictionary View Objects
+Dictionary view objects
 ^^^^^^^^^^^^^^^^^^^^^^^
 
 .. c:function:: int PyDictViewSet_Check(PyObject *op)
@@ -490,7 +490,58 @@ Dictionary View Objects
    always succeeds.
 
 
-Ordered Dictionaries
+Frozen dictionary objects
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. versionadded:: next
+
+
+.. c:var:: PyTypeObject PyFrozenDict_Type
+
+   This instance of :c:type:`PyTypeObject` represents the Python frozen
+   dictionary type.
+   This is the same object as :class:`frozendict` in the Python layer.
+
+
+.. c:function:: int PyAnyDict_Check(PyObject *p)
+
+   Return true if *p* is a :class:`dict` object, a :class:`frozendict` object,
+   or an instance of a subtype of the :class:`!dict` or :class:`!frozendict`
+   type.
+   This function always succeeds.
+
+
+.. c:function:: int PyAnyDict_CheckExact(PyObject *p)
+
+   Return true if *p* is a :class:`dict` object or a :class:`frozendict` object,
+   but not an instance of a subtype of the :class:`!dict` or
+   :class:`!frozendict` type.
+   This function always succeeds.
+
+
+.. c:function:: int PyFrozenDict_Check(PyObject *p)
+
+   Return true if *p* is a :class:`frozendict` object or an instance of a
+   subtype of the :class:`!frozendict` type.
+   This function always succeeds.
+
+
+.. c:function:: int PyFrozenDict_CheckExact(PyObject *p)
+
+   Return true if *p* is a :class:`frozendict` object, but not an instance of a
+   subtype of the :class:`!frozendict` type.
+   This function always succeeds.
+
+
+.. c:function:: PyObject* PyFrozenDict_New(PyObject *iterable)
+
+   Return a new :class:`frozendict` from an iterable, or ``NULL`` on failure
+   with an exception set.
+
+   Create an empty dictionary if *iterable* is ``NULL``.
+
+
+Ordered dictionaries
 ^^^^^^^^^^^^^^^^^^^^
 
 Python's C API provides interface for :class:`collections.OrderedDict` from C.

Doc/library/datetime.rst

@@ -2534,8 +2534,8 @@ requires, and these work on all supported platforms.
 |  ``%d``   | Day of the month as a          | 01, 02, ..., 31        | \(9)  |
 |           | zero-padded decimal number.    |                        |       |
 +-----------+--------------------------------+------------------------+-------+
-|  ``%D``   | Equivalent to ``%m/%d/%y``.    | 11/10/2025             | \(9), |
-|           |                                |                        | \(0)  |
+|  ``%D``   | Equivalent to ``%m/%d/%y``.    | 11/28/25               | \(9)  |
+|           |                                |                        |       |
 +-----------+--------------------------------+------------------------+-------+
 |  ``%e``   | The day of the month as a      | ␣1, ␣2, ..., 31        |       |
 |           | space-padded decimal number.   |                        |       |
@@ -2676,7 +2676,7 @@ differences between platforms in handling of unsupported format specifiers.
    ``%:z`` was added for :meth:`~.datetime.strftime`.
 
 .. versionadded:: 3.15
-   ``%:z`` and ``%F`` were added for :meth:`~.datetime.strptime`.
+   ``%:z``, ``%F``, and ``%D`` were added for :meth:`~.datetime.strptime`.
 
 Technical Detail
 ^^^^^^^^^^^^^^^^

Doc/library/mailbox.rst

@@ -78,6 +78,14 @@ Supported mailbox formats are Maildir, mbox, MH, Babyl, and MMDF.
       message.  Failing to lock the mailbox runs the risk of losing messages or
       corrupting the entire mailbox.
 
+   The :class:`!Mailbox` class supports the :keyword:`with` statement.  When used
+   as a context manager, :class:`!Mailbox` calls :meth:`lock` when the context is entered,
+   returns the mailbox object as the context object, and at context end calls :meth:`close`,
+   thereby releasing the lock.
+
+   .. versionchanged:: next
+      Support for the :keyword:`with` statement was added.
+
    :class:`!Mailbox` instances have the following methods: