Merge branch 'main' into fix-issue-133672

Author: ljfp

.github/CODEOWNERS

@@ -156,16 +156,15 @@ Misc/libabigail.abignore      @encukou
 # ----------------------------------------------------------------------------
 
 # Android
-Android/                      @mhsmith @freakboy3742
+Platforms/Android/            @mhsmith @freakboy3742
 Doc/using/android.rst         @mhsmith @freakboy3742
 Lib/_android_support.py       @mhsmith @freakboy3742
 Lib/test/test_android.py      @mhsmith @freakboy3742
 
 # iOS
 Doc/using/ios.rst             @freakboy3742
 Lib/_ios_support.py           @freakboy3742
-Apple/                        @freakboy3742
-iOS/                          @freakboy3742
+Platforms/Apple/              @freakboy3742
 
 # macOS
 Mac/                          @python/macos-team
@@ -176,8 +175,8 @@ Lib/test/test__osx_support.py @python/macos-team
 Tools/wasm/README.md          @brettcannon @freakboy3742 @emmatyping
 
 # WebAssembly (Emscripten)
-Tools/wasm/config.site-wasm32-emscripten  @freakboy3742 @emmatyping
-Tools/wasm/emscripten                     @freakboy3742 @emmatyping
+Platforms/emscripten          @freakboy3742 @emmatyping
+Tools/wasm/emscripten         @freakboy3742 @emmatyping
 
 # WebAssembly (WASI)
 Platforms/WASI                @brettcannon @emmatyping @savannahostrowski
@@ -574,9 +573,9 @@ Lib/shutil.py                 @giampaolo
 Lib/test/test_shutil.py       @giampaolo
 
 # Site
-Lib/site.py                   @FFY00
-Lib/test/test_site.py         @FFY00
-Doc/library/site.rst          @FFY00
+Lib/site.py                   @FFY00 @warsaw
+Lib/test/test_site.py         @FFY00 @warsaw
+Doc/library/site.rst          @FFY00 @warsaw
 
 # string.templatelib
 Doc/library/string.templatelib.rst        @lysnikolaou @AA-Turner
@@ -587,10 +586,10 @@ Lib/test/test_string/test_templatelib.py  @lysnikolaou @AA-Turner
 **/*sysconfig*                @FFY00
 
 # SQLite 3
-Doc/library/sqlite3.rst       @berkerpeksag @erlend-aasland
-Lib/sqlite3/                  @berkerpeksag @erlend-aasland
-Lib/test/test_sqlite3/        @berkerpeksag @erlend-aasland
-Modules/_sqlite/              @berkerpeksag @erlend-aasland
+Doc/library/sqlite3.rst       @erlend-aasland
+Lib/sqlite3/                  @erlend-aasland
+Lib/test/test_sqlite3/        @erlend-aasland
+Modules/_sqlite/              @erlend-aasland
 
 # Subprocess
 Lib/subprocess.py             @gpshead
@@ -623,9 +622,6 @@ Modules/_typesmodule.c        @AA-Turner
 Lib/unittest/mock.py             @cjw296
 Lib/test/test_unittest/testmock/ @cjw296
 
-# Urllib
-**/*robotparser*              @berkerpeksag
-
 # Venv
 **/*venv*                     @vsajip @FFY00
 

.github/ISSUE_TEMPLATE/bug.yml

@@ -34,13 +34,13 @@ body:
       label: "CPython versions tested on:"
       multiple: true
       options:
-        - "3.9"
         - "3.10"
         - "3.11"
         - "3.12"
         - "3.13"
         - "3.14"
         - "3.15"
+        - "3.16"
         - "CPython main branch"
     validations:
       required: true

.github/ISSUE_TEMPLATE/crash.yml

@@ -27,13 +27,13 @@ body:
       label: "CPython versions tested on:"
       multiple: true
       options:
-        - "3.9"
         - "3.10"
         - "3.11"
         - "3.12"
         - "3.13"
         - "3.14"
         - "3.15"
+        - "3.16"
         - "CPython main branch"
     validations:
       required: true

.github/workflows/mypy.yml

@@ -69,12 +69,11 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+      - uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
         with:
           python-version: "3.15"
-          allow-prereleases: true
-          cache: pip
-          cache-dependency-path: Tools/requirements-dev.txt
-      - run: pip install -r Tools/requirements-dev.txt
+          activate-environment: true
+          cache-dependency-glob: Tools/requirements-dev.txt
+      - run: uv pip install -r Tools/requirements-dev.txt
       - run: python3 Misc/mypy/make_symlinks.py --symlink
-      - run: mypy --config-file ${{ matrix.target }}/mypy.ini
+      - run: mypy --num-workers 4 --config-file ${{ matrix.target }}/mypy.ini

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

@@ -27,7 +27,7 @@ apt-get -yq --no-install-recommends install \
     zlib1g-dev
 
 # Workaround missing libmpdec-dev on ubuntu 24.04 by building mpdecimal
-# from source. ppa:ondrej/php (launchpad.net) are unreliable 
+# 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/

Doc/c-api/dict.rst

@@ -151,7 +151,7 @@ Dictionary objects
    * If the key is present, set *\*result* to a new :term:`strong reference`
      to the value and return ``1``.
    * If the key is missing, set *\*result* to ``NULL`` and return ``0``.
-   * On error, raise an exception and return ``-1``.
+   * On error, raise an exception, set *\*result* to ``NULL`` and return ``-1``.
 
    The first argument can be a :class:`dict` or a :class:`frozendict`.
 

Doc/c-api/exceptions.rst

@@ -1375,7 +1375,7 @@ Tracebacks
    The caller does not need to hold an :term:`attached thread state`, nor does
    *tstate* need to be attached.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
 .. c:function:: const char* PyUnstable_DumpTracebackThreads(int fd, PyInterpreterState *interp, PyThreadState *current_tstate, Py_ssize_t max_threads)
 
@@ -1411,4 +1411,4 @@ Tracebacks
       another thread deletes its :term:`thread state` while this function is being
       called, the process will likely crash.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15

Doc/c-api/gcsupport.rst

@@ -414,7 +414,7 @@ In some cases, failure is not distinguishable from a successful ``NULL`` result.
 
    See :ref:`duringgc-functions` for common information.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
    .. seealso::
 
@@ -433,7 +433,7 @@ In some cases, failure is not distinguishable from a successful ``NULL`` result.
    The reference is valid for the duration
    of the :c:member:`!tp_traverse` handler call.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
    .. seealso:: :c:func:`PyType_GetBaseByToken`
 
@@ -445,7 +445,7 @@ In some cases, failure is not distinguishable from a successful ``NULL`` result.
    These functions return a :term:`borrowed reference`, which is
    valid for the duration of the :c:member:`!tp_traverse` handler call.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
    .. seealso::