Merge branch 'main' into gh-95953-difflib-css-class

Author: KatieLG

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:

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

Lib/test/test_importlib/metadata/_issue138313.py

@@ -374,6 +374,8 @@ def setUp(self):
         # Add self.zip_name to the front of sys.path.
         self.resources = contextlib.ExitStack()
         self.addCleanup(self.resources.close)
+        # workaround for #138313
+        self.addCleanup(lambda: None)
 
 
 def parameterize(*args_set):

Lib/test/test_importlib/metadata/fixtures.py

@@ -22,7 +22,6 @@
 )
 
 from . import fixtures
-from . import _issue138313
 from ._path import Symlink
 
 
@@ -358,7 +357,6 @@ def test_packages_distributions_example(self):
         self._fixture_on_path('example-21.12-py3-none-any.whl')
         assert packages_distributions()['example'] == ['example']
 
-    @_issue138313.skip_on_buildbot
     def test_packages_distributions_example2(self):
         """
         Test packages_distributions on a wheel built

Lib/test/test_importlib/metadata/test_main.py

@@ -0,0 +1,2 @@
+Restore skipped test and add janky workaround to prevent select buildbots
+from failing with a ResourceWarning.