Merge branch 'main' into fix-imap-buffersize-close

Author: oyiakoumis

.github/CODEOWNERS

@@ -432,6 +432,7 @@ Lib/test/test_*time.py           @pganssle @StanFromIreland
 Modules/*zoneinfo*               @pganssle @StanFromIreland
 Modules/*time*                   @pganssle @StanFromIreland
 Python/pytime.c                  @pganssle @StanFromIreland
+Python/_strptime.c               @pganssle @StanFromIreland
 
 # Dbm
 Doc/library/dbm.rst           @corona10 @erlend-aasland @serhiy-storchaka

.github/workflows/jit.yml

@@ -87,24 +87,16 @@ jobs:
           ./PCbuild/rt.bat ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
 
   macos:
-    name: ${{ matrix.target }} (${{ matrix.debug && 'Debug' || 'Release' }})
+    name: aarch64-apple-darwin/clang (${{ matrix.debug && 'Debug' || 'Release' }})
 
-    runs-on: ${{ matrix.runner }}
+    runs-on: macos-26
     timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
-        target:
-          - x86_64-apple-darwin/clang
-          - aarch64-apple-darwin/clang
         debug:
           - true
           - false
-        include:
-          - target: x86_64-apple-darwin/clang
-            runner: macos-26-intel
-          - target: aarch64-apple-darwin/clang
-            runner: macos-26
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:

.github/workflows/tail-call.yml

@@ -24,17 +24,9 @@ env:
 
 jobs:
   macos:
-    name: ${{ matrix.target }}
-    runs-on: ${{ matrix.runner }}
+    name: aarch64-apple-darwin/clang
+    runs-on: macos-26
     timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - target: x86_64-apple-darwin/clang
-            runner: macos-26-intel
-          - target: aarch64-apple-darwin/clang
-            runner: macos-26
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
@@ -49,7 +41,6 @@ jobs:
       - name: Build
         run: |
           export SDKROOT="$(xcrun --show-sdk-path)"
-          export PATH="/usr/local/opt/llvm@${{ env.LLVM_VERSION }}/bin:$PATH"
           export PATH="/opt/homebrew/opt/llvm@${{ env.LLVM_VERSION }}/bin:$PATH"
           CC=clang-${{ env.LLVM_VERSION }} ./configure --with-tail-call-interp
           make all --jobs 4

.gitignore

@@ -102,6 +102,7 @@ Modules/Setup.config
 Modules/Setup.local
 Modules/Setup.stdlib
 Modules/config.c
+Modules/config_bootstrap.c
 Modules/ld_so_aix
 Programs/_freeze_module
 Programs/_testembed

Doc/c-api/buffer.rst

@@ -284,19 +284,38 @@ The flags that control the logical structure of the memory are listed
 in decreasing order of complexity. Note that each flag contains all bits
 of the flags below it.
 
-.. tabularcolumns:: |p{0.35\linewidth}|l|l|l|
-
-+-----------------------------+-------+---------+------------+
-|  Request                    | shape | strides | suboffsets |
-+=============================+=======+=========+============+
-| .. c:macro:: PyBUF_INDIRECT |  yes  |   yes   | if needed  |
-+-----------------------------+-------+---------+------------+
-| .. c:macro:: PyBUF_STRIDES  |  yes  |   yes   |    NULL    |
-+-----------------------------+-------+---------+------------+
-| .. c:macro:: PyBUF_ND       |  yes  |   NULL  |    NULL    |
-+-----------------------------+-------+---------+------------+
-| .. c:macro:: PyBUF_SIMPLE   |  NULL |   NULL  |    NULL    |
-+-----------------------------+-------+---------+------------+
+.. stable-abi-note::
+
+   These values are available when compiling for the
+   :ref:`Stable ABI <stable>` since version 3.11.
+
+.. omit-stable-abi-notes::
+
+   .. list-table::
+      :align: left
+      :widths: auto
+      :header-rows: 1
+
+      * - Request
+        - shape
+        - strides
+        - suboffsets
+      * - .. c:macro:: PyBUF_INDIRECT
+        - yes
+        - yes
+        - if needed
+      * - .. c:macro:: PyBUF_STRIDES
+        - yes
+        - yes
+        - NULL
+      * - .. c:macro:: PyBUF_ND
+        - yes
+        - NULL
+        - NULL
+      * - .. c:macro:: PyBUF_SIMPLE
+        - NULL
+        - NULL
+        - NULL
 
 
 .. index:: contiguous, C-contiguous, Fortran contiguous
@@ -308,19 +327,43 @@ C or Fortran :term:`contiguity <contiguous>` can be explicitly requested,
 with and without stride information. Without stride information, the buffer
 must be C-contiguous.
 
-.. tabularcolumns:: |p{0.35\linewidth}|l|l|l|l|
-
-+-----------------------------------+-------+---------+------------+--------+
-|  Request                          | shape | strides | suboffsets | contig |
-+===================================+=======+=========+============+========+
-| .. c:macro:: PyBUF_C_CONTIGUOUS   |  yes  |   yes   |    NULL    |   C    |
-+-----------------------------------+-------+---------+------------+--------+
-| .. c:macro:: PyBUF_F_CONTIGUOUS   |  yes  |   yes   |    NULL    |   F    |
-+-----------------------------------+-------+---------+------------+--------+
-| .. c:macro:: PyBUF_ANY_CONTIGUOUS |  yes  |   yes   |    NULL    | C or F |
-+-----------------------------------+-------+---------+------------+--------+
-| :c:macro:`PyBUF_ND`               |  yes  |   NULL  |    NULL    |   C    |
-+-----------------------------------+-------+---------+------------+--------+
+.. stable-abi-note::
+
+   These values are available when compiling for the
+   :ref:`Stable ABI <stable>` since version 3.11.
+
+.. omit-stable-abi-notes::
+
+   .. list-table::
+      :align: left
+      :widths: auto
+      :header-rows: 1
+
+      * - Request
+        - shape
+        - strides
+        - suboffsets
+        - contig
+      * - .. c:macro:: PyBUF_C_CONTIGUOUS
+        - yes
+        - yes
+        - NULL
+        - C
+      * - .. c:macro:: PyBUF_F_CONTIGUOUS
+        - yes
+        - yes
+        - NULL
+        - F
+      * - .. c:macro:: PyBUF_ANY_CONTIGUOUS
+        - yes
+        - yes
+        - NULL
+        - C or F
+      * - :c:macro:`PyBUF_ND`
+        - yes
+        - NULL
+        - NULL
+        - C
 
 
 compound requests
@@ -333,27 +376,81 @@ used combinations as single flags.
 In the following table *U* stands for undefined contiguity. The consumer would
 have to call :c:func:`PyBuffer_IsContiguous` to determine contiguity.
 
-.. tabularcolumns:: |p{0.35\linewidth}|l|l|l|l|l|l|
-
-+-------------------------------+-------+---------+------------+--------+----------+--------+
-|  Request                      | shape | strides | suboffsets | contig | readonly | format |
-+===============================+=======+=========+============+========+==========+========+
-| .. c:macro:: PyBUF_FULL       |  yes  |   yes   | if needed  |   U    |     0    |  yes   |
-+-------------------------------+-------+---------+------------+--------+----------+--------+
-| .. c:macro:: PyBUF_FULL_RO    |  yes  |   yes   | if needed  |   U    |  1 or 0  |  yes   |
-+-------------------------------+-------+---------+------------+--------+----------+--------+
-| .. c:macro:: PyBUF_RECORDS    |  yes  |   yes   |    NULL    |   U    |     0    |  yes   |
-+-------------------------------+-------+---------+------------+--------+----------+--------+
-| .. c:macro:: PyBUF_RECORDS_RO |  yes  |   yes   |    NULL    |   U    |  1 or 0  |  yes   |
-+-------------------------------+-------+---------+------------+--------+----------+--------+
-| .. c:macro:: PyBUF_STRIDED    |  yes  |   yes   |    NULL    |   U    |     0    |  NULL  |
-+-------------------------------+-------+---------+------------+--------+----------+--------+
-| .. c:macro:: PyBUF_STRIDED_RO |  yes  |   yes   |    NULL    |   U    |  1 or 0  |  NULL  |
-+-------------------------------+-------+---------+------------+--------+----------+--------+
-| .. c:macro:: PyBUF_CONTIG     |  yes  |   NULL  |    NULL    |   C    |     0    |  NULL  |
-+-------------------------------+-------+---------+------------+--------+----------+--------+
-| .. c:macro:: PyBUF_CONTIG_RO  |  yes  |   NULL  |    NULL    |   C    |  1 or 0  |  NULL  |
-+-------------------------------+-------+---------+------------+--------+----------+--------+
+.. stable-abi-note::
+
+   These values are available when compiling for the
+   :ref:`Stable ABI <stable>` since version 3.11.
+
+.. omit-stable-abi-notes::
+
+   .. list-table::
+      :align: left
+      :widths: auto
+      :header-rows: 1
+
+      * - Request
+        - shape
+        - strides
+        - suboffsets
+        - contig
+        - readonly
+        - format
+      * - .. c:macro:: PyBUF_FULL
+        - yes
+        - yes
+        - if needed
+        - U
+        - 0
+        - yes
+      * - .. c:macro:: PyBUF_FULL_RO
+        - yes
+        - yes
+        - if needed
+        - U
+        - 1 or 0
+        - yes
+      * - .. c:macro:: PyBUF_RECORDS
+        - yes
+        - yes
+        - NULL
+        - U
+        - 0
+        - yes
+      * - .. c:macro:: PyBUF_RECORDS_RO
+        - yes
+        - yes
+        - NULL
+        - U
+        - 1 or 0
+        - yes
+      * - .. c:macro:: PyBUF_STRIDED
+        - yes
+        - yes
+        - NULL
+        - U
+        - 0
+        - NULL
+      * - .. c:macro:: PyBUF_STRIDED_RO
+        - yes
+        - yes
+        - NULL
+        - U
+        - 1 or 0
+        - NULL
+      * - .. c:macro:: PyBUF_CONTIG
+        - yes
+        - NULL
+        - NULL
+        - C
+        - 0
+        - NULL
+      * - .. c:macro:: PyBUF_CONTIG_RO
+        - yes
+        - NULL
+        - NULL
+        - C
+        - 1 or 0
+        - NULL
 
 
 Complex arrays

Doc/c-api/bytes.rst

@@ -494,7 +494,7 @@ Variant using a pointer to compute the final size::
 
         char *str = PyBytesWriter_GetData(writer);
         memcpy(str, "abc", 3);
-        str += 1;
+        str += 3;
         return PyBytesWriter_FinishWithPointer(writer, str);
     }
 
@@ -543,7 +543,7 @@ Update ``_PyBytes_Resize()`` code
 
 Example of code using the soft deprecated ``_PyBytes_Resize()`` API::
 
-    void create_string(Py_ssize_t size)
+    PyObject* create_string(Py_ssize_t size)
     {
         PyObject *bytes = PyBytes_FromStringAndSize(NULL, size);
         if (bytes == NULL) {
@@ -561,7 +561,7 @@ Example of code using the soft deprecated ``_PyBytes_Resize()`` API::
 
 It can now be updated to::
 
-    void create_string(Py_ssize_t size)
+    PyObject* create_string(Py_ssize_t size)
     {
         PyBytesWriter *writer = PyBytesWriter_Create(size);
         if (writer == NULL) {

Doc/c-api/call.rst

@@ -81,17 +81,17 @@ This is a pointer to a function with the following signature:
 
 - *callable* is the object being called.
 - *args* is a C array consisting of the positional arguments followed by the
-   values of the keyword arguments.
-   This can be *NULL* if there are no arguments.
+  values of the keyword arguments.
+  This can be *NULL* if there are no arguments.
 - *nargsf* is the number of positional arguments plus possibly the
-   :c:macro:`PY_VECTORCALL_ARGUMENTS_OFFSET` flag.
-   To get the actual number of positional arguments from *nargsf*,
-   use :c:func:`PyVectorcall_NARGS`.
+  :c:macro:`PY_VECTORCALL_ARGUMENTS_OFFSET` flag.
+  To get the actual number of positional arguments from *nargsf*,
+  use :c:func:`PyVectorcall_NARGS`.
 - *kwnames* is a tuple containing the names of the keyword arguments;
-   in other words, the keys of the kwargs dict.
-   These names must be strings (instances of ``str`` or a subclass)
-   and they must be unique.
-   If there are no keyword arguments, then *kwnames* can instead be *NULL*.
+  in other words, the keys of the kwargs dict.
+  These names must be strings (instances of ``str`` or a subclass)
+  and they must be unique.
+  If there are no keyword arguments, then *kwnames* can instead be *NULL*.
 
 .. c:macro:: PY_VECTORCALL_ARGUMENTS_OFFSET
 

Doc/c-api/datetime.rst

@@ -13,7 +13,7 @@ the module initialisation function.  The macro puts a pointer to a C structure
 into a static variable, :c:data:`PyDateTimeAPI`, that is used by the following
 macros.
 
-.. c:macro:: PyDateTime_IMPORT()
+.. c:macro:: PyDateTime_IMPORT
 
    Import the datetime C API.
 
@@ -51,7 +51,7 @@ macros.
    .. versionchanged:: 3.15
 
       This variable should not be accessed directly as direct access is not thread-safe.
-      Use :c:func:`PyDateTime_IMPORT` instead.
+      Use :c:macro:`PyDateTime_IMPORT` instead.
 
 .. c:type:: PyDateTime_Date
 

Doc/c-api/function.rst

@@ -193,7 +193,7 @@ There are a few functions specific to Python functions.
 
    .. versionadded:: 3.12
 
-    - ``PyFunction_PYFUNC_EVENT_MODIFY_QUALNAME``
+    - ``PyFunction_EVENT_MODIFY_QUALNAME``
 
    .. versionadded:: 3.15
 

Doc/c-api/gcsupport.rst

@@ -251,6 +251,7 @@ The :c:member:`~PyTypeObject.tp_traverse` handler must have the following type:
    to the handler.  The *visit* function must not be called with a ``NULL``
    object argument.  If *visit* returns a non-zero value, that value should be
    returned immediately.
+   Otherwise, return zero.
 
    A typical :c:member:`!tp_traverse` function calls the :c:func:`Py_VISIT`
    convenience macro on each of the instance's members that are Python
@@ -317,6 +318,14 @@ The :c:member:`~PyTypeObject.tp_traverse` handler must have the following type:
    For a list of safe functions, see a
    :ref:`separate section <duringgc-functions>` below.
 
+   If an error occurs during traversal, ignore it and return 0.
+   If ``tp_traverse`` fails to visit some strong references, garbage reference
+   cycles involving the skipped references will not be reliably broken,
+   but correctness won't be affected.
+   For example, if traversal requires a lock that cannot be acquired promptly,
+   skip the traversal.
+   The garbage collector will visit your object again in a future pass.
+
    .. note::
 
       The :c:func:`Py_VISIT` call may be skipped for those members that provably
@@ -362,7 +371,7 @@ implementation must name its arguments exactly *visit* and *arg*:
    This corresponds roughly to::
 
       #define Py_VISIT(o)                             \
-         if (op) {                                    \
+         if (o) {                                    \
             int visit_result = visit(o, arg);         \
             if (visit_result != 0) {                  \
                return visit_result;                   \