Merge branch 'main' into gh-110131-argparse-append-default

Author: savannahostrowski

.github/dependabot.yml

@@ -7,11 +7,6 @@ updates:
     labels:
       - "skip issue"
       - "skip news"
-    ignore:
-      - dependency-name: "*"
-        update-types:
-          - "version-update:semver-minor"
-          - "version-update:semver-patch"
     groups:
       actions:
         patterns:

.github/workflows/require-pr-label.yml

@@ -62,3 +62,6 @@ jobs:
           count: 1
           labels: |
             awaiting merge
+          message: >-
+            This PR is labelled type-feature. All features require approval from a
+            core team member before merge. Found: {{ applied }}

Doc/c-api/init_config.rst

@@ -116,15 +116,14 @@ Error Handling
 
    Get the *config* exit code.
 
-   * Set *\*exitcode* and return ``1`` if *config* has an exit code set.
-   * Return ``0`` if *config* has no exit code set.
+   Return ``0`` and leave *\*exitcode* unchanged.
 
-   Only the ``Py_InitializeFromInitConfig()`` function can set an exit
-   code if the ``parse_argv`` option is non-zero.
+   In Python 3.15, :c:func:`Py_InitializeFromInitConfig` sets an exit code if a
+   command line option wants to exit Python. This is no longer the case in
+   Python 3.16. Instead, the option is now processed in :c:func:`Py_RunMain`.
+   This function became useless.
 
-   An exit code can be set when parsing the command line failed (exit
-   code ``2``) or when a command line option asks to display the command
-   line help (exit code ``0``).
+   .. deprecated:: next
 
 
 Get Options
@@ -247,10 +246,11 @@ Initialize Python
 
    * Return ``0`` on success.
    * Set an error in *config* and return ``-1`` on error.
-   * Set an exit code in *config* and return ``-1`` if Python wants to
-     exit.
 
-   See ``PyInitConfig_GetExitcode()`` for the exit code case.
+   .. versionchanged:: next
+      The function no longer sets an exit code if a command line option wants
+      to exit Python. Instead, the option is now processed in
+      :c:func:`Py_RunMain`.
 
 
 .. _pyinitconfig-opts:
@@ -690,9 +690,6 @@ Example of customized Python always running in isolated mode::
 
     exception:
         PyConfig_Clear(&config);
-        if (PyStatus_IsExit(status)) {
-            return status.exitcode;
-        }
         /* Display the error message and exit the process with
            non-zero exit code */
         Py_ExitStatusException(status);
@@ -758,6 +755,8 @@ PyStatus
 
       Exit code. Argument passed to ``exit()``.
 
+      .. deprecated:: next
+
    .. c:member:: const char *err_msg
 
       Error message.
@@ -788,6 +787,11 @@ PyStatus
 
       Exit Python with the specified exit code.
 
+      .. deprecated:: next
+         :c:func:`Py_InitializeFromConfig` no longer sets an exit code if a
+         command line option wants to exit Python. Instead, the option is
+         now processed in :c:func:`Py_RunMain`.
+
    Functions to handle a status:
 
    .. c:function:: int PyStatus_Exception(PyStatus status)
@@ -803,6 +807,11 @@ PyStatus
 
       Is the result an exit?
 
+      .. deprecated:: next
+         :c:func:`Py_InitializeFromConfig` no longer sets an exit code if a
+         command line option wants to exit Python. Instead, the option is
+         now processed in :c:func:`Py_RunMain`.
+
    .. c:function:: void Py_ExitStatusException(PyStatus status)
 
       Call ``exit(exitcode)`` if *status* is an exit. Print the error

Doc/c-api/interp-lifecycle.rst

@@ -127,6 +127,11 @@ Initializing and finalizing the interpreter
    interpreter, populating the runtime configuration structure, and querying
    the returned status structure.
 
+   .. versionchanged:: next
+      The function no longer returns an exit code if a command line option
+      wants to exit Python. Instead, the option is processed in
+      :c:func:`Py_RunMain`.
+
 
 .. c:function:: int Py_IsInitialized()
 

Doc/c-api/slice.rst

@@ -53,6 +53,7 @@ Slice Objects
    length *length*, and store the length of the slice in *slicelength*.  Out
    of bounds indices are clipped in a manner consistent with the handling of
    normal slices.
+   *length* must not be negative.
 
    Return ``0`` on success and ``-1`` on error with an exception set.
 
@@ -108,6 +109,10 @@ Slice Objects
    Out of bounds indices are clipped in a manner consistent with the handling
    of normal slices.
 
+   *length* must not be negative.
+   *step* must not be zero and must not be less than ``-PY_SSIZE_T_MAX``,
+   as guaranteed by :c:func:`PySlice_Unpack`.
+
    Return the length of the slice.  Always successful.  Doesn't call Python
    code.
 

Doc/conf.py

@@ -469,6 +469,10 @@
 # https://github.com/sphinx-doc/sphinx/issues/12359
 epub_use_index = False
 
+# The default depth of 3 lists over a thousand entries, which makes the
+# table of contents hard to navigate in e-book readers
+epub_tocdepth = 2
+
 # translation tag
 # ---------------
 

Doc/howto/free-threading-python.rst

@@ -79,10 +79,7 @@ The free-threaded build of CPython aims to provide similar thread-safety
 behavior at the Python level to the default GIL-enabled build.  Built-in
 types like :class:`dict`, :class:`list`, and :class:`set` use internal locks
 to protect against concurrent modifications in ways that behave similarly to
-the GIL.  However, Python has not historically guaranteed specific behavior for
-concurrent modifications to these built-in types, so this should be treated
-as a description of the current implementation, not a guarantee of current or
-future behavior.
+the GIL.  See :ref:`threadsafety` for the guarantees provided by built-in types.
 
 .. note::
 

Doc/library/argparse.rst

@@ -2103,7 +2103,7 @@ Mutual exclusion
      >>> group.add_argument('--bar', action='store_false')
      >>> parser.parse_args([])
      usage: PROG [-h] (--foo | --bar)
-     PROG: error: one of the arguments --foo --bar is required
+     PROG: error: one of the following arguments is required: --foo, --bar
 
    Note that currently mutually exclusive argument groups do not support the
    *title* and *description* arguments of

Doc/library/ctypes.rst

@@ -1755,6 +1755,9 @@ These prefabricated library loaders are available:
       :c:expr:`int`, which is of course not always the truth, so you have to assign
       the correct :attr:`!restype` attribute to use these functions.
 
+      Note that if the Python interpreter is statically linked, this will be
+      ``None``, as ``dlopen`` is not possible in this case.
+
 .. audit-event:: ctypes.dlopen name ctypes.LibraryLoader
 
    Loading a library through any of these objects raises an

Doc/library/dis.rst

@@ -1899,32 +1899,38 @@ iterations of the loop.
 
    The operand determines which intrinsic function is called:
 
-   +------------------------------------------+-----------------------------------+
-   | Operand                                  | Description                       |
-   +==========================================+===================================+
-   | ``INTRINSIC_2_INVALID``                  | Not valid                         |
-   +------------------------------------------+-----------------------------------+
-   | ``INTRINSIC_PREP_RERAISE_STAR``          | Calculates the                    |
-   |                                          | :exc:`ExceptionGroup` to raise    |
-   |                                          | from a ``try-except*``.           |
-   +------------------------------------------+-----------------------------------+
-   | ``INTRINSIC_TYPEVAR_WITH_BOUND``         | Creates a :class:`typing.TypeVar` |
-   |                                          | with a bound.                     |
-   +------------------------------------------+-----------------------------------+
-   | ``INTRINSIC_TYPEVAR_WITH_CONSTRAINTS``   | Creates a                         |
-   |                                          | :class:`typing.TypeVar` with      |
-   |                                          | constraints.                      |
-   +------------------------------------------+-----------------------------------+
-   | ``INTRINSIC_SET_FUNCTION_TYPE_PARAMS``   | Sets the ``__type_params__``      |
-   |                                          | attribute of a function.          |
-   +------------------------------------------+-----------------------------------+
-   | ``INTRINSIC_ADD_CONDITIONAL_ANNOTATION`` | Adds an annotation index to the   |
-   |                                          | ``__conditional_annotations__``   |
-   |                                          | set.                              |
-   +------------------------------------------+-----------------------------------+
+   +------------------------------------------+-----------------------------------------+
+   | Operand                                  | Description                             |
+   +==========================================+=========================================+
+   | ``INTRINSIC_2_INVALID``                  | Not valid                               |
+   +------------------------------------------+-----------------------------------------+
+   | ``INTRINSIC_PREP_RERAISE_STAR``          | Calculates the                          |
+   |                                          | :exc:`ExceptionGroup` to raise          |
+   |                                          | from a ``try-except*``.                 |
+   +------------------------------------------+-----------------------------------------+
+   | ``INTRINSIC_TYPEVAR_WITH_BOUND``         | Creates a :class:`typing.TypeVar`       |
+   |                                          | with a bound.                           |
+   +------------------------------------------+-----------------------------------------+
+   | ``INTRINSIC_TYPEVAR_WITH_CONSTRAINTS``   | Creates a                               |
+   |                                          | :class:`typing.TypeVar` with            |
+   |                                          | constraints.                            |
+   +------------------------------------------+-----------------------------------------+
+   | ``INTRINSIC_SET_FUNCTION_TYPE_PARAMS``   | Sets the ``__type_params__``            |
+   |                                          | attribute of a function.                |
+   +------------------------------------------+-----------------------------------------+
+   | ``INTRINSIC_ADD_CONDITIONAL_ANNOTATION`` | Adds an annotation index to the         |
+   |                                          | ``__conditional_annotations__``         |
+   |                                          | set.                                    |
+   +------------------------------------------+-----------------------------------------+
+   | ``INTRINSIC_MATCH_CLASS_ISINSTANCE``     | Do :func:`isinstance` checks for        |
+   |                                          | :ref:`Class patterns <class-patterns>`. |
+   +------------------------------------------+-----------------------------------------+
 
    .. versionadded:: 3.12
 
+   .. versionchanged:: 3.16
+      Added ``INTRINSIC_MATCH_CLASS_ISINSTANCE``.
+
 
 .. opcode:: LOAD_SPECIAL