Merge remote-tracking branch 'origin/main' into specialize-enable-deferred

Author: nascheme

.github/CODEOWNERS

@@ -289,10 +289,10 @@ Tools/jit/                    @brandtbucher @savannahostrowski @diegorusso
 InternalDocs/jit.md           @brandtbucher @savannahostrowski @diegorusso @AA-Turner
 
 # Micro-op / μop / Tier 2 Optimiser
-Python/optimizer.c            @markshannon
+Python/optimizer.c            @markshannon @Fidget-Spinner
 Python/optimizer_analysis.c   @markshannon @tomasr8 @Fidget-Spinner
 Python/optimizer_bytecodes.c  @markshannon @tomasr8 @Fidget-Spinner
-Python/optimizer_symbols.c    @markshannon @tomasr8
+Python/optimizer_symbols.c    @markshannon @tomasr8 @Fidget-Spinner
 
 # Parser, Lexer, and Grammar
 Grammar/python.gram           @pablogsal @lysnikolaou

.github/workflows/mypy.yml

@@ -26,6 +26,7 @@ on:
       - "Tools/build/update_file.py"
       - "Tools/build/verify_ensurepip_wheels.py"
       - "Tools/cases_generator/**"
+      - "Tools/check-c-api-docs/**"
       - "Tools/clinic/**"
       - "Tools/jit/**"
       - "Tools/peg_generator/**"
@@ -58,6 +59,7 @@ jobs:
           "Lib/tomllib",
           "Tools/build",
           "Tools/cases_generator",
+          "Tools/check-c-api-docs",
           "Tools/clinic",
           "Tools/jit",
           "Tools/peg_generator",

.github/workflows/tail-call.yml

@@ -79,19 +79,17 @@ jobs:
         with:
           python-version: '3.11'
 
-      - name: Native Windows (debug)
+      - name: Native Windows MSVC (release)
         if: runner.os == 'Windows' && matrix.architecture != 'ARM64'
         shell: cmd
         run: |
-          choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0
-          set PlatformToolset=clangcl
-          set LLVMToolsVersion=${{ matrix.llvm }}.1.0
-          set LLVMInstallDir=C:\Program Files\LLVM
-          call ./PCbuild/build.bat --tail-call-interp -d -p ${{ matrix.architecture }}
-          call ./PCbuild/rt.bat -d -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
+          choco install visualstudio2026buildtools --no-progress -y --force --params "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64  --locale en-US --passive"
+          $env:PATH = "C:\Program Files (x86)\Microsoft Visual Studio\18\BuildTools\MSBuild\Current\bin;$env:PATH"
+          ./PCbuild/build.bat --tail-call-interp -c Release -p ${{ matrix.architecture }} "/p:PlatformToolset=v145"
+          ./PCbuild/rt.bat -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
 
       # No tests (yet):
-      - name: Emulated Windows (release)
+      - name: Emulated Windows Clang (release)
         if: runner.os == 'Windows' && matrix.architecture == 'ARM64'
         shell: cmd
         run: |

Doc/c-api/extension-modules.rst

@@ -29,7 +29,7 @@ and must be named after the module name plus an extension listed in
 Extension export hook
 .....................
 
-.. versionadded:: next
+.. versionadded:: 3.15
 
    Support for the :samp:`PyModExport_{<name>}` export hook was added in Python
    3.15. The older way of defining modules is still available: consult either
@@ -191,7 +191,7 @@ the :c:data:`Py_mod_multiple_interpreters` slot.
 ``PyInit`` function
 ...................
 
-.. deprecated:: next
+.. deprecated:: 3.15
 
    This functionality is :term:`soft deprecated`.
    It will not get new features, but there are no plans to remove it.
@@ -272,7 +272,7 @@ For example, a module called ``spam`` would be defined like this::
 Legacy single-phase initialization
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. deprecated:: next
+.. deprecated:: 3.15
 
    Single-phase initialization is :term:`soft deprecated`.
    It is a legacy mechanism to initialize extension

Doc/c-api/intro.rst

@@ -107,6 +107,46 @@ header files properly declare the entry points to be ``extern "C"``. As a result
 there is no need to do anything special to use the API from C++.
 
 
+.. _capi-system-includes:
+
+System includes
+---------------
+
+   :file:`Python.h` includes several standard header files.
+   C extensions should include the standard headers that they use,
+   and should not rely on these implicit includes.
+   The implicit includes are:
+
+   * ``<assert.h>``
+   * ``<intrin.h>`` (on Windows)
+   * ``<inttypes.h>``
+   * ``<limits.h>``
+   * ``<math.h>``
+   * ``<stdarg.h>``
+   * ``<wchar.h>``
+   * ``<sys/types.h>`` (if present)
+
+   The following are included for backwards compatibility, unless using
+   :ref:`Limited API <limited-c-api>` 3.13 or newer:
+
+   * ``<ctype.h>``
+   * ``<unistd.h>`` (on POSIX)
+
+   The following are included for backwards compatibility, unless using
+   :ref:`Limited API <limited-c-api>` 3.11 or newer:
+
+   * ``<errno.h>``
+   * ``<stdio.h>``
+   * ``<stdlib.h>``
+   * ``<string.h>``
+
+.. note::
+
+   Since Python may define some pre-processor definitions which affect the standard
+   headers on some systems, you *must* include :file:`Python.h` before any standard
+   headers are included.
+
+
 Useful macros
 =============
 

Doc/c-api/module.rst

@@ -142,7 +142,7 @@ Modules created using the C API are typically defined using an
 array of :dfn:`slots`.
 The slots provide a "description" of how a module should be created.
 
-.. versionchanged:: next
+.. versionchanged:: 3.15
 
    Previously, a :c:type:`PyModuleDef` struct was necessary to define modules.
    The older way of defining modules is still available: consult either the
@@ -190,7 +190,7 @@ Metadata slots
    However, it is still recommended to include this slot for introspection
    and debugging purposes.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
       Use :c:member:`PyModuleDef.m_name` instead to support previous versions.
 
@@ -201,7 +201,7 @@ Metadata slots
 
    Usually it is set to a variable created with :c:macro:`PyDoc_STRVAR`.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
       Use :c:member:`PyModuleDef.m_doc` instead to support previous versions.
 
@@ -332,7 +332,7 @@ Creation and initialization slots
 
    .. versionadded:: 3.5
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
 
       The *slots* argument may be a ``ModuleSpec``-like object, rather than
       a true :py:class:`~importlib.machinery.ModuleSpec` instance.
@@ -365,7 +365,7 @@ Creation and initialization slots
 
    .. versionadded:: 3.5
 
-   .. versionchanged:: next
+   .. versionchanged:: 3.15
 
       Repeated ``Py_mod_exec`` slots are disallowed, except in
       :c:type:`PyModuleDef.m_slots`.
@@ -384,7 +384,7 @@ Creation and initialization slots
    The table must be statically allocated (or otherwise guaranteed to outlive
    the module object).
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
       Use :c:member:`PyModuleDef.m_methods` instead to support previous versions.
 
@@ -434,7 +434,7 @@ To retrieve the state from a given module, use the following functions:
 
    On error, set *\*result* to -1, and return -1 with an exception set.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
 
 
@@ -459,7 +459,7 @@ defining the module state.
 
    Use :c:func:`PyModule_GetStateSize` to retrieve the size of a given module.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
       Use :c:member:`PyModuleDef.m_size` instead to support previous versions.
 
@@ -482,7 +482,7 @@ defining the module state.
    (:c:data:`Py_mod_state_size`) is greater than 0 and the module state
    (as returned by :c:func:`PyModule_GetState`) is ``NULL``.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
       Use :c:member:`PyModuleDef.m_size` instead to support previous versions.
 
@@ -510,7 +510,7 @@ defining the module state.
    the cyclic garbage collector is not involved and
    the :c:macro:`Py_mod_state_free` function is called directly.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
       Use :c:member:`PyModuleDef.m_clear` instead to support previous versions.
 
@@ -532,7 +532,7 @@ defining the module state.
    (:c:data:`Py_mod_state_size`) is greater than 0 and the module state
    (as returned by :c:func:`PyModule_GetState`) is ``NULL``.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
       Use :c:member:`PyModuleDef.m_free` instead to support previous versions.
 
@@ -593,15 +593,15 @@ A module's token -- and the *your_token* value to use in the above code -- is:
    This means that :c:macro:`!Py_mod_token` cannot be used in
    :c:member:`PyModuleDef.m_slots`.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
 .. c:function:: int PyModule_GetToken(PyObject *module, void** result)
 
    Set *\*result* to the module's token and return 0.
 
    On error, set *\*result* to NULL, and return -1 with an exception set.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
 See also :c:func:`PyType_GetModuleByToken`.
 
@@ -641,7 +641,7 @@ rather than from an extension's :ref:`export hook <extension-export-hook>`.
    :c:func:`!PyModule_FromSlotsAndSpec` call.
    In particular, it may be heap-allocated.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
 .. c:function:: int PyModule_Exec(PyObject *module)
 
@@ -654,7 +654,7 @@ rather than from an extension's :ref:`export hook <extension-export-hook>`.
    :ref:`legacy single-phase initialization <single-phase-initialization>`,
    this function does nothing and returns 0.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
 
 

Doc/c-api/object.rst

@@ -111,7 +111,7 @@ Object Protocol
        object type name: str
        object repr     : 'abcdef'
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
 
 .. c:function:: int PyObject_HasAttrWithError(PyObject *o, PyObject *attr_name)

Doc/c-api/tuple.rst

@@ -148,8 +148,11 @@ Tuple Objects
 Struct Sequence Objects
 -----------------------
 
-Struct sequence objects are the C equivalent of :func:`~collections.namedtuple`
-objects, i.e. a sequence whose items can also be accessed through attributes.
+A struct sequence object is a :term:`named tuple`, that is, a sequence
+whose items can also be accessed through attributes.
+It is similar to :func:`collections.namedtuple`, but provides a slightly
+different interface.
+
 To create a struct sequence, you first have to create a specific struct sequence
 type.
 

Doc/c-api/type.rst

@@ -317,7 +317,7 @@ Type Objects
    and other places where a method's defining class cannot be passed using the
    :c:type:`PyCMethod` calling convention.
 
-   .. versionadded:: next
+   .. versionadded:: 3.15
 
 
 .. c:function:: PyObject* PyType_GetModuleByDef(PyTypeObject *type, struct PyModuleDef *def)

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

@@ -1,9 +1,9 @@
 Pending removal in Python 3.20
 ------------------------------
 
-* The ``__version__`` attribute has been deprecated in these standard library
-  modules and will be removed in Python 3.20.
-  Use :py:data:`sys.version_info` instead.
+* The ``__version__``, ``version`` and ``VERSION`` attributes have been
+  deprecated in these standard library modules and will be removed in
+  Python 3.20. Use :py:data:`sys.version_info` instead.
 
   - :mod:`argparse`
   - :mod:`csv`
@@ -23,6 +23,10 @@ Pending removal in Python 3.20
   - :mod:`tabnanny`
   - :mod:`tkinter.font`
   - :mod:`tkinter.ttk`
+  - :mod:`wsgiref.simple_server`
+  - :mod:`xml.etree.ElementTree`
+  - :mod:`!xml.sax.expatreader`
+  - :mod:`xml.sax.handler`
   - :mod:`zlib`
 
   (Contributed by Hugo van Kemenade and Stan Ulbrych in :gh:`76007`.)