Merge branch 'main' into 3.15-pprint-defaults

Author: hugovk

.github/workflows/build.yml

@@ -278,13 +278,14 @@ jobs:
           # unsupported as it most resembles other 1.1.1-work-a-like ssl APIs
           # supported by important vendors such as AWS-LC.
           - { name: openssl, version: 1.1.1w }
-          - { name: openssl, version: 3.0.19 }
-          - { name: openssl, version: 3.3.6 }
-          - { name: openssl, version: 3.4.4 }
-          - { name: openssl, version: 3.5.5 }
-          - { name: openssl, version: 3.6.1 }
+          - { name: openssl, version: 3.0.20 }
+          - { name: openssl, version: 3.3.7 }
+          - { name: openssl, version: 3.4.5 }
+          - { name: openssl, version: 3.5.6 }
+          - { name: openssl, version: 3.6.2 }
+          - { name: openssl, version: 4.0.0 }
           ## AWS-LC
-          - { name: aws-lc, version: 1.68.0 }
+          - { name: aws-lc, version: 1.72.1 }
     env:
       SSLLIB_VER: ${{ matrix.ssllib.version }}
       MULTISSL_DIR: ${{ github.workspace }}/multissl
@@ -398,7 +399,7 @@ jobs:
     needs: build-context
     if: needs.build-context.outputs.run-ubuntu == 'true'
     env:
-      OPENSSL_VER: 3.5.5
+      OPENSSL_VER: 3.5.6
       PYTHONSTRICTEXTENSIONBUILD: 1
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -506,7 +507,7 @@ jobs:
       matrix:
         os: [ubuntu-24.04]
     env:
-      OPENSSL_VER: 3.5.5
+      OPENSSL_VER: 3.5.6
       PYTHONSTRICTEXTENSIONBUILD: 1
       ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
     steps:

.github/workflows/posix-deps-apt.sh

@@ -26,9 +26,16 @@ apt-get -yq --no-install-recommends install \
     xvfb \
     zlib1g-dev
 
-# Workaround missing libmpdec-dev on ubuntu 24.04:
-# https://launchpad.net/~ondrej/+archive/ubuntu/php
-# https://deb.sury.org/
-sudo add-apt-repository ppa:ondrej/php
-apt-get update
-apt-get -yq --no-install-recommends install libmpdec-dev
+# Workaround missing libmpdec-dev on ubuntu 24.04 by building mpdecimal
+# from source. ppa:ondrej/php (launchpad.net) are unreliable 
+# (https://status.canonical.com) so fetch the tarball directly
+# from the upstream host.
+# https://www.bytereef.org/mpdecimal/
+MPDECIMAL_VERSION=4.0.1
+curl -fsSL "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-${MPDECIMAL_VERSION}.tar.gz" \
+    | tar -xz -C /tmp
+(cd "/tmp/mpdecimal-${MPDECIMAL_VERSION}" \
+    && ./configure --prefix=/usr/local \
+    && make -j"$(nproc)" \
+    && make install)
+ldconfig

.github/workflows/reusable-ubuntu.yml

@@ -35,7 +35,7 @@ jobs:
     runs-on: ${{ inputs.os }}
     timeout-minutes: 60
     env:
-      OPENSSL_VER: 3.5.5
+      OPENSSL_VER: 3.5.6
       PYTHONSTRICTEXTENSIONBUILD: 1
       TERM: linux
     steps:

.gitignore

@@ -140,6 +140,7 @@ Tools/unicode/data/
 /.ccache
 /cross-build*/
 /jit_stencils*.h
+/jit_unwind_info*.h
 /platform
 /profile-clean-stamp
 /profile-run-stamp

Doc/c-api/perfmaps.rst

@@ -31,7 +31,7 @@ Note that holding an :term:`attached thread state` is not required for these API
    or ``-2`` on failure to create a lock. Check ``errno`` for more information
    about the cause of a failure.
 
-.. c:function:: int PyUnstable_WritePerfMapEntry(const void *code_addr, unsigned int code_size, const char *entry_name)
+.. c:function:: int PyUnstable_WritePerfMapEntry(const void *code_addr, size_t code_size, const char *entry_name)
 
    Write one single entry to the ``/tmp/perf-$pid.map`` file. This function is
    thread safe. Here is what an example entry looks like::

Doc/c-api/synchronization.rst

@@ -84,11 +84,6 @@ there is no :c:type:`PyObject` -- for example, when working with a C type that
 does not extend or wrap :c:type:`PyObject` but still needs to call into the C
 API in a manner that might lead to deadlocks.
 
-The functions and structs used by the macros are exposed for cases
-where C macros are not available. They should only be used as in the
-given macro expansions. Note that the sizes and contents of the structures may
-change in future Python versions.
-
 .. note::
 
    Operations that need to lock two objects at once must use
@@ -114,12 +109,15 @@ section API avoids potential deadlocks due to reentrancy and lock ordering
 by allowing the runtime to temporarily suspend the critical section if the
 code triggered by the finalizer blocks and calls :c:func:`PyEval_SaveThread`.
 
+.. _critical-section-macros:
+
 .. c:macro:: Py_BEGIN_CRITICAL_SECTION(op)
 
    Acquires the per-object lock for the object *op* and begins a
    critical section.
 
-   In the free-threaded build, this macro expands to::
+   In the free-threaded build, and when building for the
+   :ref:`Stable ABI <stable-abi>`, this macro expands to::
 
       {
           PyCriticalSection _py_cs;
@@ -150,7 +148,8 @@ code triggered by the finalizer blocks and calls :c:func:`PyEval_SaveThread`.
 
    Ends the critical section and releases the per-object lock.
 
-   In the free-threaded build, this macro expands to::
+   In the free-threaded build, and when building for the
+   :ref:`Stable ABI <stable-abi>`, this macro expands to::
 
           PyCriticalSection_End(&_py_cs);
       }
@@ -179,7 +178,8 @@ code triggered by the finalizer blocks and calls :c:func:`PyEval_SaveThread`.
 
    Locks the mutexes *m1* and *m2* and begins a critical section.
 
-   In the free-threaded build, this macro expands to::
+   In the free-threaded build, and when building for the
+   :ref:`Stable ABI <stable-abi>`, this macro expands to::
 
      {
           PyCriticalSection2 _py_cs2;
@@ -196,7 +196,8 @@ code triggered by the finalizer blocks and calls :c:func:`PyEval_SaveThread`.
 
    Ends the critical section and releases the per-object locks.
 
-   In the free-threaded build, this macro expands to::
+   In the free-threaded build, and when building for the
+   :ref:`Stable ABI <stable-abi>`, this macro expands to::
 
           PyCriticalSection2_End(&_py_cs2);
       }
@@ -205,6 +206,48 @@ code triggered by the finalizer blocks and calls :c:func:`PyEval_SaveThread`.
 
    .. versionadded:: 3.13
 
+Low-level critical section API
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The following functions and structs are exposed for cases where C macros
+are not available.
+
+.. c:function:: void PyCriticalSection_Begin(PyCriticalSection *c, PyObject *op)
+                void PyCriticalSection_End(PyCriticalSection *c)
+                void PyCriticalSection2_Begin(PyCriticalSection2 *c, PyObject *a, PyObject *b)
+                void PyCriticalSection2_End(PyCriticalSection2 *c);
+
+   To be used only as in the macro expansions
+   listed :ref:`earlier in this section <critical-section-macros>`.
+
+   In non-:term:`free-threaded <free threading>` builds of CPython, these
+   functions do nothing.
+
+   .. versionadded:: 3.13
+
+.. c:type:: PyCriticalSection
+            PyCriticalSection2
+
+   To be used only as in the macro expansions
+   listed :ref:`earlier in this section <critical-section-macros>`.
+   Note that the contents of the structures are private and their meaning may
+   change in future Python versions.
+
+   .. versionadded:: 3.13
+
+.. c:function:: void PyCriticalSection_BeginMutex(PyCriticalSection *c, PyMutex *m);
+                void PyCriticalSection2_BeginMutex(PyCriticalSection2 *c, PyMutex *m1, PyMutex *m2);
+
+   .. (These need to be in a separate section without a Stable ABI anotation.)
+
+   To be used only as in the macro expansions
+   listed :ref:`earlier in this section <critical-section-macros>`.
+
+   In non-:term:`free-threaded <free threading>` builds of CPython, these
+   functions do nothing.
+
+   .. versionadded:: 3.14
+
 
 Legacy locking APIs
 -------------------

Doc/data/stable_abi.dat

@@ -10,3 +10,9 @@ Pending removal in Python 3.18
     specifier ``'N'``, which is only supported in the :mod:`!decimal` module's
     C implementation, has been deprecated since Python 3.13.
     (Contributed by Serhiy Storchaka in :gh:`89902`.)
+
+* Deprecations defined by :pep:`829`:
+
+  * ``import`` lines in :file:`{name}.pth` files are silently ignored.
+
+  (Contributed by Barry Warsaw in :gh:`148641`.)

Doc/deprecations/pending-removal-in-3.18.rst

@@ -22,3 +22,12 @@ Pending removal in Python 3.19
     supported depending on the backend implementation of hash functions.
     Prefer passing the initial data as a positional argument for maximum
     backwards compatibility.
+
+* :mod:`http.cookies`:
+
+  * :meth:`http.cookies.Morsel.js_output` is deprecated and will be
+    removed in Python 3.19.
+
+  * :meth:`http.cookies.BaseCookie.js_output` is deprecated and will be
+    removed in Python 3.19.
+

Doc/deprecations/pending-removal-in-3.19.rst

@@ -38,3 +38,18 @@ Pending removal in Python 3.20
   - :mod:`zlib`
 
   (Contributed by Hugo van Kemenade and Stan Ulbrych in :gh:`76007`.)
+
+* Deprecations defined by :pep:`829`:
+
+  * Warnings are produced for ``import`` lines found in :file:`{name}.pth`
+    files.
+
+  * :file:`{name}.pth` files are no longer decoded in the locale encoding by
+    default.  They **MUST** be encoded in ``utf-8-sig``.
+
+  (Contributed by Barry Warsaw in :gh:`148641`.)
+
+* :mod:`ast`:
+
+  * Creating instances of abstract AST nodes (such as :class:`ast.AST`
+    or :class:`!ast.expr`) is deprecated and will raise an error in Python 3.20.