Merge branch 'main' into fix_warning_pycore_ceval

Author: colesbury

Doc/c-api/typeobj.rst

@@ -2,8 +2,8 @@
 
 .. _type-structs:
 
-Type Objects
-============
+Type Object Structures
+======================
 
 Perhaps one of the most important structures of the Python object system is the
 structure that defines a new type: the :c:type:`PyTypeObject` structure.  Type

Doc/c-api/unicode.rst

@@ -1868,7 +1868,7 @@ The following API is deprecated.
 
    .. versionadded:: 3.3
 
-   .. deprecated:: next
+   .. deprecated:: 3.14
       This API does nothing since Python 3.12.
       Previously, this could be called to check if
       :c:func:`PyUnicode_READY` is necessary.

Doc/conf.py

@@ -33,7 +33,6 @@
     'issue_role',
     'lexers',
     'misc_news',
-    'pydoc_topics',
     'pyspecific',
     'sphinx.ext.coverage',
     'sphinx.ext.doctest',

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

@@ -57,7 +57,7 @@ Pending removal in Python 3.15
 
 * :mod:`sysconfig`:
 
-  * The ``check_home`` argument of :func:`sysconfig.is_python_build` has been
+  * The *check_home* argument of :func:`sysconfig.is_python_build` has been
     deprecated since Python 3.12.
 
 * :mod:`threading`:

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

@@ -111,9 +111,6 @@ although there is currently no date scheduled for their removal.
   * ``ssl.TLSVersion.TLSv1``
   * ``ssl.TLSVersion.TLSv1_1``
 
-* :func:`sysconfig.is_python_build` *check_home* parameter is deprecated and
-  ignored.
-
 * :mod:`threading` methods:
 
   * :meth:`!threading.Condition.notifyAll`: use :meth:`~threading.Condition.notify_all`.

Doc/library/cmdline.rst

@@ -25,7 +25,7 @@ The following modules have a command-line interface.
 * :ref:`json <json-commandline>`
 * :ref:`mimetypes <mimetypes-cli>`
 * :mod:`pdb`
-* :mod:`pickle`
+* :ref:`pickle <pickle-cli>`
 * :ref:`pickletools <pickletools-cli>`
 * :mod:`platform`
 * :mod:`poplib`

Doc/library/concurrent.futures.rst

@@ -73,7 +73,7 @@ Executor Objects
       .. versionchanged:: 3.5
          Added the *chunksize* parameter.
 
-      .. versionchanged:: next
+      .. versionchanged:: 3.14
          Added the *buffersize* parameter.
 
    .. method:: shutdown(wait=True, *, cancel_futures=False)
@@ -431,7 +431,7 @@ to a :class:`ProcessPoolExecutor` will result in deadlock.
       After calling this method the caller should no longer submit tasks to the
       executor.
 
-      .. versionadded:: next
+      .. versionadded:: 3.14
 
    .. method:: kill_workers()
 
@@ -443,7 +443,7 @@ to a :class:`ProcessPoolExecutor` will result in deadlock.
       After calling this method the caller should no longer submit tasks to the
       executor.
 
-      .. versionadded:: next
+      .. versionadded:: 3.14
 
 .. _processpoolexecutor-example:
 

Doc/library/contextvars.rst

@@ -112,7 +112,7 @@ Context Variables
 
        assert var.get() == 'default value'
 
-   .. versionadded:: next
+   .. versionadded:: 3.14
 
       Added support for usage as a context manager.
 

Doc/library/http.server.rst

@@ -418,49 +418,6 @@ the current directory::
 such as using different index file names by overriding the class attribute
 :attr:`index_pages`.
 
-.. _http-server-cli:
-
-:mod:`http.server` can also be invoked directly using the :option:`-m`
-switch of the interpreter.  Similar to
-the previous example, this serves files relative to the current directory::
-
-        python -m http.server
-
-The server listens to port 8000 by default. The default can be overridden
-by passing the desired port number as an argument::
-
-        python -m http.server 9000
-
-By default, the server binds itself to all interfaces.  The option ``-b/--bind``
-specifies a specific address to which it should bind. Both IPv4 and IPv6
-addresses are supported. For example, the following command causes the server
-to bind to localhost only::
-
-        python -m http.server --bind 127.0.0.1
-
-.. versionchanged:: 3.4
-   Added the ``--bind`` option.
-
-.. versionchanged:: 3.8
-   Support IPv6 in the ``--bind`` option.
-
-By default, the server uses the current directory. The option ``-d/--directory``
-specifies a directory to which it should serve the files. For example,
-the following command uses a specific directory::
-
-        python -m http.server --directory /tmp/
-
-.. versionchanged:: 3.7
-   Added the ``--directory`` option.
-
-By default, the server is conformant to HTTP/1.0. The option ``-p/--protocol``
-specifies the HTTP version to which the server is conformant. For example, the
-following command runs an HTTP/1.1 conformant server::
-
-        python -m http.server --protocol HTTP/1.1
-
-.. versionchanged:: 3.11
-   Added the ``--protocol`` option.
 
 .. class:: CGIHTTPRequestHandler(request, client_address, server)
 
@@ -510,25 +467,85 @@ following command runs an HTTP/1.1 conformant server::
       Retaining it could lead to further :ref:`security considerations
       <http.server-security>`.
 
-:class:`CGIHTTPRequestHandler` can be enabled in the command line by passing
-the ``--cgi`` option::
 
-        python -m http.server --cgi
+.. _http-server-cli:
+
+Command-line interface
+----------------------
+
+:mod:`http.server` can also be invoked directly using the :option:`-m`
+switch of the interpreter.  The following example illustrates how to serve
+files relative to the current directory::
+
+   python -m http.server [OPTIONS] [port]
+
+The following options are accepted:
+
+.. program:: http.server
 
-.. deprecated-removed:: 3.13 3.15
+.. option:: port
 
-   :mod:`http.server` command line ``--cgi`` support is being removed
-   because :class:`CGIHTTPRequestHandler` is being removed.
+   The server listens to port 8000 by default. The default can be overridden
+   by passing the desired port number as an argument::
+
+      python -m http.server 9000
+
+.. option:: -b, --bind <address>
+
+   Specifies a specific address to which it should bind. Both IPv4 and IPv6
+   addresses are supported. By default, the server binds itself to all
+   interfaces. For example, the following command causes the server to bind
+   to localhost only::
+
+      python -m http.server --bind 127.0.0.1
+
+   .. versionadded:: 3.4
+
+   .. versionchanged:: 3.8
+      Support IPv6 in the ``--bind`` option.
+
+.. option:: -d, --directory <dir>
+
+   Specifies a directory to which it should serve the files. By default,
+   the server uses the current directory. For example, the following command
+   uses a specific directory::
+
+      python -m http.server --directory /tmp/
+
+   .. versionadded:: 3.7
+
+.. option:: -p, --protocol <version>
+
+   Specifies the HTTP version to which the server is conformant. By default,
+   the server is conformant to HTTP/1.0. For example, the following command
+   runs an HTTP/1.1 conformant server::
+
+      python -m http.server --protocol HTTP/1.1
+
+   .. versionadded:: 3.11
+
+.. option:: --cgi
+
+   :class:`CGIHTTPRequestHandler` can be enabled in the command line by passing
+   the ``--cgi`` option::
+
+      python -m http.server --cgi
+
+   .. deprecated-removed:: 3.13 3.15
+
+      :mod:`http.server` command line ``--cgi`` support is being removed
+      because :class:`CGIHTTPRequestHandler` is being removed.
 
 .. warning::
 
-   :class:`CGIHTTPRequestHandler` and the ``--cgi`` command line option
+   :class:`CGIHTTPRequestHandler` and the ``--cgi`` command-line option
    are not intended for use by untrusted clients and may be vulnerable
    to exploitation. Always use within a secure environment.
 
+
 .. _http.server-security:
 
-Security Considerations
+Security considerations
 -----------------------
 
 .. index:: pair: http.server; security

Doc/library/io.rst

@@ -1160,7 +1160,7 @@ with :deco:`typing.runtime_checkable`.
    usually be :class:`str` or :class:`bytes`, but can be any type that is
    read from the stream.
 
-   .. versionadded:: next
+   .. versionadded:: 3.14
 
    .. method:: read()
                read(size, /)
@@ -1181,7 +1181,7 @@ with :deco:`typing.runtime_checkable`.
    usually be :class:`str` or :class:`bytes`, but can be any type that can be
    written to the stream.
 
-   .. versionadded:: next
+   .. versionadded:: 3.14
 
    .. method:: write(data, /)