Merge branch 'main' into interpolation-doc-fix

Author: davepeck

.github/CONTRIBUTING.rst

@@ -34,17 +34,18 @@ our workflow that are not covered by a bot or status check are:
 - All discussions that are not directly related to the code in the pull request
   should happen on `GitHub Issues <https://github.com/python/cpython/issues>`_.
 - Upon your first non-trivial pull request (which includes documentation changes),
-  feel free to add yourself to ``Misc/ACKS``
+  feel free to add yourself to ``Misc/ACKS``.
 
 
 Setting Expectations
 --------------------
-Due to the fact that this project is entirely volunteer-run (i.e. no one is paid
-to work on Python full-time), we unfortunately can make no guarantees as to if
+Due to the fact that this project is run by volunteers,
+unfortunately we cannot make any guarantees as to if
 or when a core developer will get around to reviewing your pull request.
 If no core developer has done a review or responded to changes made because of a
-"changes requested" review, please feel free to email python-dev to ask if
-someone could take a look at your pull request.
+"changes requested" review within a month, you can ask for someone to
+review your pull request via a post in the `Core Development Discourse
+category <https://discuss.python.org/c/core-dev/23>`__.
 
 
 Code of Conduct

Doc/library/mmap.rst

@@ -212,7 +212,8 @@ To map anonymous memory, -1 should be passed as the fileno along with the length
          Writable :term:`bytes-like object` is now accepted.
 
 
-   .. method:: flush([offset[, size]])
+   .. method:: flush()
+               flush(offset, size, /)
 
       Flushes changes made to the in-memory copy of a file back to disk. Without
       use of this call there is no guarantee that changes are written back before

Doc/library/os.rst

@@ -2017,8 +2017,8 @@ features:
   must be a string specifying a file path.  However, some functions now
   alternatively accept an open file descriptor for their *path* argument.
   The function will then operate on the file referred to by the descriptor.
-  (For POSIX systems, Python will call the variant of the function prefixed
-  with ``f`` (e.g. call ``fchdir`` instead of ``chdir``).)
+  For POSIX systems, Python will call the variant of the function prefixed
+  with ``f`` (e.g. call ``fchdir`` instead of ``chdir``).
 
   You can check whether or not *path* can be specified as a file descriptor
   for a particular function on your platform using :data:`os.supports_fd`.
@@ -2033,7 +2033,7 @@ features:
 * **paths relative to directory descriptors:** If *dir_fd* is not ``None``, it
   should be a file descriptor referring to a directory, and the path to operate
   on should be relative; path will then be relative to that directory.  If the
-  path is absolute, *dir_fd* is ignored.  (For POSIX systems, Python will call
+  path is absolute, *dir_fd* is ignored.  For POSIX systems, Python will call
   the variant of the function with an ``at`` suffix and possibly prefixed with
   ``f`` (e.g. call ``faccessat`` instead of ``access``).
 
@@ -2046,8 +2046,8 @@ features:
 * **not following symlinks:** If *follow_symlinks* is
   ``False``, and the last element of the path to operate on is a symbolic link,
   the function will operate on the symbolic link itself rather than the file
-  pointed to by the link.  (For POSIX systems, Python will call the ``l...``
-  variant of the function.)
+  pointed to by the link.  For POSIX systems, Python will call the ``l...``
+  variant of the function.
 
   You can check whether or not *follow_symlinks* is supported for a particular
   function on your platform using :data:`os.supports_follow_symlinks`.

Doc/library/zoneinfo.rst

@@ -299,7 +299,7 @@ The behavior of a ``ZoneInfo`` file depends on how it was constructed:
 1. ``ZoneInfo(key)``: When constructed with the primary constructor, a
    ``ZoneInfo`` object is serialized by key, and when deserialized, the
    deserializing process uses the primary and thus it is expected that these
-   are expected to be the same object as other references to the same time
+   are the same object as other references to the same time
    zone.  For example, if ``europe_berlin_pkl`` is a string containing a pickle
    constructed from ``ZoneInfo("Europe/Berlin")``, one would expect the
    following behavior:

Doc/reference/compound_stmts.rst

@@ -594,6 +594,7 @@ the items are surrounded by parentheses. For example::
       statement.
 
 .. _match:
+.. _case:
 
 The :keyword:`!match` statement
 ===============================

Lib/difflib.py

@@ -1924,8 +1924,11 @@ def _format_line(self,side,flag,linenum,text):
         # make space non-breakable so they don't get compressed or line wrapped
         text = text.replace(' ',' ').rstrip()
 
-        return '<td class="diff_header"%s>%s</td><td nowrap="nowrap">%s</td>' \
-               % (id,linenum,text)
+        # add a class to the td tag if there is a difference on the line
+        css_class = ' class="diff_changed" ' if flag else ' '
+
+        return f'<td class="diff_header"{id}>{linenum}</td>' \
+            + f'<td{css_class}nowrap="nowrap">{text}</td>'
 
     def _make_prefix(self):
         """Create unique anchor prefixes"""

Lib/test/test_capi/test_misc.py

@@ -1996,6 +1996,7 @@ def test_pending_call_creates_thread_subinterpreter(self):
         def output():
             time.sleep(1)
             os.write({w}, b"x")
+            os.close({w})
 
 
         def callback():
@@ -2014,6 +2015,7 @@ def create_pending_call():
         interp.close()
         data = os.read(r, 1)
         self.assertEqual(data, b"x")
+        os.close(r)
 
 
 @requires_subinterpreters