Merge branch 'main' into nedbat/split-builtin-stdlib

Author: nedbat

.github/CODEOWNERS

@@ -630,7 +630,7 @@ Lib/test/test_unittest/testmock/ @cjw296
 Doc/library/zlib.rst          @StanFromIreland
 Lib/compression/zlib.py       @StanFromIreland
 Lib/test/test_zlib.py         @StanFromIreland
-Modules/_zlibmodule.c         @StanFromIreland
+Modules/zlibmodule.c          @StanFromIreland
 
 # Zipfile.Path
 Lib/test/test_zipfile/_path/  @jaraco

.github/workflows/reusable-docs.yml

@@ -86,6 +86,9 @@ jobs:
           --fail-if-regression \
           --fail-if-improved \
           --fail-if-new-news-nit
+    - name: 'Build list of changes'
+      run: |
+        make -C Doc/ PYTHON=../python changes
     - name: 'Collect HTML IDs'
       if: github.event_name == 'pull_request'
       run: python Doc/tools/check-html-ids.py collect Doc/build/html -o Doc/build/html-ids-head.json.gz

Doc/c-api/complex.rst

@@ -197,3 +197,6 @@ the :ref:`Number Protocol <number>` API or use native complex types, like
    Set :c:data:`errno` to :c:macro:`!ERANGE` on overflows.
 
    .. deprecated:: 3.15
+
+   .. versionchanged:: next
+      This function leaves :c:data:`errno` unchanged on success.

Doc/library/socket.rst

@@ -1497,7 +1497,7 @@ Socket Objects
    of :meth:`socket.getpeername` but not the actual OS resource.  Unlike
    :func:`socket.fromfd`, *fileno* will return the same socket and not a
    duplicate. This may help close a detached socket using
-   :meth:`socket.close`.
+   :meth:`~socket.socket.close`.
 
    The newly created socket is :ref:`non-inheritable <fd_inheritance>`.
 
@@ -1544,7 +1544,7 @@ Socket Objects
 
    .. versionchanged:: 3.2
       Support for the :term:`context manager` protocol was added.  Exiting the
-      context manager is equivalent to calling :meth:`~socket.close`.
+      context manager is equivalent to calling :meth:`~socket.socket.close`.
 
 
    .. method:: accept()
@@ -1769,7 +1769,7 @@ Socket Objects
 
       Closing the file object returned by :meth:`makefile` won't close the
       original socket unless all other file objects have been closed and
-      :meth:`socket.close` has been called on the socket object.
+      :meth:`~socket.socket.close` has been called on the socket object.
 
       .. note::
 

Doc/library/warnings.rst

@@ -68,45 +68,48 @@ The following warnings category classes are currently defined:
 +----------------------------------+-----------------------------------------------+
 | Class                            | Description                                   |
 +==================================+===============================================+
-| :exc:`Warning`                   | This is the base class of all warning         |
-|                                  | category classes.  It is a subclass of        |
-|                                  | :exc:`Exception`.                             |
+| :exc:`Warning`                   | Base class for warning categories. It is a    |
+|                                  | subclass of :exc:`Exception`.                 |
 +----------------------------------+-----------------------------------------------+
-| :exc:`UserWarning`               | The default category for :func:`warn`.        |
+| :exc:`UserWarning`               | Base class for warnings generated by user     |
+|                                  | code. The default category for :func:`warn`.  |
 +----------------------------------+-----------------------------------------------+
-| :exc:`DeprecationWarning`        | Base category for warnings about deprecated   |
+| :exc:`DeprecationWarning`        | Base class for warnings about deprecated      |
 |                                  | features when those warnings are intended for |
 |                                  | other Python developers (ignored by default,  |
 |                                  | unless triggered by code in ``__main__``).    |
 +----------------------------------+-----------------------------------------------+
-| :exc:`SyntaxWarning`             | Base category for warnings about dubious      |
-|                                  | syntactic features (typically emitted when    |
-|                                  | compiling Python source code, and hence       |
-|                                  | may not be suppressed by runtime filters)     |
+| :exc:`PendingDeprecationWarning` | Base class for warnings about features        |
+|                                  | that will be deprecated in the future         |
+|                                  | (ignored by default).                         |
 +----------------------------------+-----------------------------------------------+
-| :exc:`RuntimeWarning`            | Base category for warnings about dubious      |
-|                                  | runtime features.                             |
+| :exc:`SyntaxWarning`             | Base class for warnings about dubious syntax  |
+|                                  | (typically emitted when compiling Python      |
+|                                  | source code, and hence may not be suppressed  |
+|                                  | by runtime filters).                          |
 +----------------------------------+-----------------------------------------------+
-| :exc:`FutureWarning`             | Base category for warnings about deprecated   |
+| :exc:`RuntimeWarning`            | Base class for warnings about dubious runtime |
+|                                  | behavior.                                     |
++----------------------------------+-----------------------------------------------+
+| :exc:`FutureWarning`             | Base class for warnings about deprecated      |
 |                                  | features when those warnings are intended for |
 |                                  | end users of applications that are written in |
 |                                  | Python.                                       |
 +----------------------------------+-----------------------------------------------+
-| :exc:`PendingDeprecationWarning` | Base category for warnings about features     |
-|                                  | that will be deprecated in the future         |
-|                                  | (ignored by default).                         |
-+----------------------------------+-----------------------------------------------+
-| :exc:`ImportWarning`             | Base category for warnings triggered during   |
+| :exc:`ImportWarning`             | Base class for warnings triggered during      |
 |                                  | the process of importing a module (ignored by |
 |                                  | default).                                     |
 +----------------------------------+-----------------------------------------------+
-| :exc:`UnicodeWarning`            | Base category for warnings related to         |
+| :exc:`UnicodeWarning`            | Base class for warnings related to            |
 |                                  | Unicode.                                      |
 +----------------------------------+-----------------------------------------------+
-| :exc:`BytesWarning`              | Base category for warnings related to         |
+| :exc:`EncodingWarning`           | Base class for warnings related to encodings. |
+|                                  | See :ref:`io-encoding-warning` for details.   |
++----------------------------------+-----------------------------------------------+
+| :exc:`BytesWarning`              | Base class for warnings related to            |
 |                                  | :class:`bytes` and :class:`bytearray`.        |
 +----------------------------------+-----------------------------------------------+
-| :exc:`ResourceWarning`           | Base category for warnings related to         |
+| :exc:`ResourceWarning`           | Base class for warnings related to            |
 |                                  | resource usage (ignored by default).          |
 +----------------------------------+-----------------------------------------------+
 

Doc/tools/extensions/changes.py

@@ -6,6 +6,7 @@
 
 from docutils import nodes
 from sphinx import addnodes
+from sphinx.builders.changes import ChangesBuilder
 from sphinx.domains.changeset import (
     VersionChange,
     versionlabel_classes,
@@ -17,6 +18,7 @@
 if TYPE_CHECKING:
     from docutils.nodes import Node
     from sphinx.application import Sphinx
+    from sphinx.environment import BuildEnvironment
     from sphinx.util.typing import ExtensionMetadata
 
 
@@ -146,6 +148,32 @@ def _add_glossary_link(cls, inline: nodes.inline) -> None:
             break
 
 
+def _fixup_changesets(app: Sphinx, env: BuildEnvironment) -> None:
+    changesets = env.get_domain("changeset").changesets
+
+    # The changeset domain records each entry's plain text before SoftDeprecated
+    # replaces the :term:, so strip the markup before the changes builder renders it.
+    for entries in changesets.values():
+        for i, entry in enumerate(entries):
+            if entry.type == "soft-deprecated":
+                entries[i] = entry._replace(
+                    content=SoftDeprecated._TERM_RE.sub(r"\1", entry.content)
+                )
+
+    # DeprecatedRemoved entries are recorded under their (deprecated,
+    # removed) version tuple, which the changes builder ignores.
+    # Re-file them under both versions.
+    for versions in [v for v in changesets if isinstance(v, tuple)]:
+        deprecated, removed = versions
+        for entry in changesets.pop(versions):
+            changesets.setdefault(deprecated, []).append(
+                entry._replace(type="deprecated")
+            )
+            changesets.setdefault(removed, []).append(
+                entry._replace(type="versionremoved")
+            )
+
+
 def setup(app: Sphinx) -> ExtensionMetadata:
     # Override Sphinx's directives with support for 'next'
     app.add_directive("versionadded", PyVersionChange, override=True)
@@ -155,9 +183,15 @@ def setup(app: Sphinx) -> ExtensionMetadata:
 
     # Register the ``.. deprecated-removed::`` directive
     app.add_directive("deprecated-removed", DeprecatedRemoved)
+    # _fixup_changesets() changes these entries to 'deprecated'/'versionremoved'
+    ChangesBuilder.typemap["deprecated-removed"] = "deprecated-removed"
 
     # Register the ``.. soft-deprecated::`` directive
     app.add_directive("soft-deprecated", SoftDeprecated)
+    ChangesBuilder.typemap["soft-deprecated"] = "soft deprecated"
+
+    # Repair the recorded changesets for the couple of custom directives above
+    app.connect("env-updated", _fixup_changesets)
 
     return {
         "version": "1.0",

Doc/whatsnew/3.16.rst

@@ -1018,6 +1018,10 @@ Porting to Python 3.16
   if the value cannot be marshalled.
   (Contributed by Serhiy Storchaka in :gh:`155907`.)
 
+* :c:func:`_Py_c_abs` no longer sets :c:data:`errno` to zero on success,
+  but rather leaves it unchanged.
+  (Contributed by Sergey B Kirpichev in :gh:`155526`.)
+
 Deprecated C APIs
 -----------------
 

Include/internal/pycore_bytesobject.h

@@ -75,6 +75,8 @@ PyAPI_FUNC(PyObject *) _PyBytes_Repeat(PyObject *self, Py_ssize_t n);
 */
 #define _PyBytesObject_SIZE (offsetof(PyBytesObject, ob_sval) + 1)
 
+extern int _PyBytes_ResizeKeepOnError(PyObject **pv, Py_ssize_t newsize);
+
 /* --- PyBytesWriter ------------------------------------------------------ */
 
 struct PyBytesWriter {

Lib/asyncio/tasks.py

@@ -268,7 +268,9 @@ def __step(self, exc=None):
             raise exceptions.InvalidStateError(
                 f'__step(): already done: {self!r}, {exc!r}')
         if self._must_cancel:
-            if not isinstance(exc, exceptions.CancelledError):
+            # gh-108549: do not swallow SystemExit and KeyboardInterrupt.
+            if not isinstance(exc, (exceptions.CancelledError,
+                                    SystemExit, KeyboardInterrupt)):
                 exc = self._make_cancelled_error()
             self._must_cancel = False
         self._fut_waiter = None
@@ -541,13 +543,18 @@ async def _cancel_and_wait(fut):
     cb = functools.partial(_release_waiter, waiter)
     fut.add_done_callback(cb)
 
+    # gh-157058: awaiting the waiter leaves no edge on fut, add it here
+    cur_task = current_task()
+    futures.future_add_to_awaited_by(fut, cur_task)
+
     try:
         fut.cancel()
         # We cannot wait on *fut* directly to make
         # sure _cancel_and_wait itself is reliably cancellable.
         await waiter
     finally:
         fut.remove_done_callback(cb)
+        futures.future_discard_from_awaited_by(fut, cur_task)
 
 
 class _AsCompletedIterator:
@@ -770,6 +777,11 @@ def cancel(self, msg=None):
         return ret
 
 
+def _discard_awaited_by(children, waiter, outer):
+    for fut in children:
+        futures.future_discard_from_awaited_by(fut, waiter)
+
+
 def gather(*coros_or_futures, return_exceptions=False):
     """Return a future aggregating results from the given coroutines/futures.
 
@@ -903,6 +915,10 @@ def _done_callback(fut, cur_task=cur_task):
         children.append(fut)
 
     outer = _GatheringFuture(children, loop=loop)
+    if cur_task is not None:
+        # gh-157213: a child outliving gather() must lose the awaited-by edge
+        outer.add_done_callback(
+            functools.partial(_discard_awaited_by, children, cur_task))
     # Run done callbacks after GatheringFuture created so any post-processing
     # can be performed at this point
     # optimization: in the special case that *all* futures finished eagerly,

Lib/base64.py

@@ -304,7 +304,8 @@ def b16decode(s, casefold=False, *, ignorechars=b''):
         for b in b'abcdef':
             if b in s and b not in ignorechars:
                 raise binascii.Error('Non-base16 digit found')
-        s = s.translate(None, delete=b'abcdef')
+        if ignorechars:
+            s = s.translate(None, delete=b'abcdef')
     return binascii.unhexlify(s, ignorechars=ignorechars)
 
 #