Merge branch '3.13' into backport-3402e13-3.13

Author: encukou

Doc/c-api/function.rst

@@ -145,12 +145,13 @@ There are a few functions specific to Python functions.
 
 .. c:type:: PyFunction_WatchEvent
 
-   Enumeration of possible function watcher events:
-   - ``PyFunction_EVENT_CREATE``
-   - ``PyFunction_EVENT_DESTROY``
-   - ``PyFunction_EVENT_MODIFY_CODE``
-   - ``PyFunction_EVENT_MODIFY_DEFAULTS``
-   - ``PyFunction_EVENT_MODIFY_KWDEFAULTS``
+    Enumeration of possible function watcher events:
+
+    - ``PyFunction_EVENT_CREATE``
+    - ``PyFunction_EVENT_DESTROY``
+    - ``PyFunction_EVENT_MODIFY_CODE``
+    - ``PyFunction_EVENT_MODIFY_DEFAULTS``
+    - ``PyFunction_EVENT_MODIFY_KWDEFAULTS``
 
    .. versionadded:: 3.12
 

Doc/glossary.rst

@@ -926,11 +926,16 @@ Glossary
       modules, respectively.
 
    namespace package
-      A :pep:`420` :term:`package` which serves only as a container for
-      subpackages.  Namespace packages may have no physical representation,
+      A :term:`package` which serves only as a container for subpackages.
+      Namespace packages may have no physical representation,
       and specifically are not like a :term:`regular package` because they
       have no ``__init__.py`` file.
 
+      Namespace packages allow several individually installable packages to have a common parent package.
+      Otherwise, it is recommended to use a :term:`regular package`.
+
+      For more information, see :pep:`420` and :ref:`reference-namespace-package`.
+
       See also :term:`module`.
 
    nested scope

Doc/library/unittest.mock.rst

@@ -1984,7 +1984,7 @@ Imagine we have a project that we want to test with the following structure::
 
 Now we want to test ``some_function`` but we want to mock out ``SomeClass`` using
 :func:`patch`. The problem is that when we import module b, which we will have to
-do then it imports ``SomeClass`` from module a. If we use :func:`patch` to mock out
+do when it imports ``SomeClass`` from module a. If we use :func:`patch` to mock out
 ``a.SomeClass`` then it will have no effect on our test; module b already has a
 reference to the *real* ``SomeClass`` and it looks like our patching had no
 effect.

Doc/reference/import.rst

@@ -123,6 +123,8 @@ Importing ``parent.one`` will implicitly execute ``parent/__init__.py`` and
 ``parent/three/__init__.py`` respectively.
 
 
+.. _reference-namespace-package:
+
 Namespace packages
 ------------------
 

Lib/asyncio/base_events.py

@@ -671,8 +671,8 @@ def _run_forever_cleanup(self):
 
     def run_forever(self):
         """Run until stop() is called."""
+        self._run_forever_setup()
         try:
-            self._run_forever_setup()
             while True:
                 self._run_once()
                 if self._stopping:

Lib/functools.py

@@ -958,9 +958,6 @@ def __init__(self, func):
         self.dispatcher = singledispatch(func)
         self.func = func
 
-        import weakref # see comment in singledispatch function
-        self._method_cache = weakref.WeakKeyDictionary()
-
     def register(self, cls, method=None):
         """generic_method.register(cls, func) -> func
 
@@ -969,16 +966,6 @@ def register(self, cls, method=None):
         return self.dispatcher.register(cls, func=method)
 
     def __get__(self, obj, cls=None):
-        if self._method_cache is not None:
-            try:
-                _method = self._method_cache[obj]
-            except TypeError:
-                self._method_cache = None
-            except KeyError:
-                pass
-            else:
-                return _method
-
         dispatch = self.dispatcher.dispatch
         funcname = getattr(self.func, '__name__', 'singledispatchmethod method')
         def _method(*args, **kwargs):
@@ -991,9 +978,6 @@ def _method(*args, **kwargs):
         _method.register = self.register
         update_wrapper(_method, self.func)
 
-        if self._method_cache is not None:
-            self._method_cache[obj] = _method
-
         return _method
 
     @property

Lib/subprocess.py

@@ -43,8 +43,10 @@
 import builtins
 import errno
 import io
+import locale
 import os
 import time
+import signal
 import sys
 import threading
 import warnings
@@ -142,8 +144,6 @@ def __init__(self, returncode, cmd, output=None, stderr=None):
 
     def __str__(self):
         if self.returncode and self.returncode < 0:
-            # Lazy import to improve module import time
-            import signal
             try:
                 return "Command '%s' died with %r." % (
                         self.cmd, signal.Signals(-self.returncode))
@@ -381,8 +381,6 @@ def _text_encoding():
     if sys.flags.utf8_mode:
         return "utf-8"
     else:
-        # Lazy import to improve module import time
-        import locale
         return locale.getencoding()
 
 
@@ -1667,9 +1665,6 @@ def send_signal(self, sig):
             # Don't signal a process that we know has already died.
             if self.returncode is not None:
                 return
-
-            # Lazy import to improve module import time
-            import signal
             if sig == signal.SIGTERM:
                 self.terminate()
             elif sig == signal.CTRL_C_EVENT:
@@ -1771,9 +1766,6 @@ def _posix_spawn(self, args, executable, env, restore_signals, close_fds,
             """Execute program using os.posix_spawn()."""
             kwargs = {}
             if restore_signals:
-                # Lazy import to improve module import time
-                import signal
-
                 # See _Py_RestoreSignals() in Python/pylifecycle.c
                 sigset = []
                 for signame in ('SIGPIPE', 'SIGXFZ', 'SIGXFSZ'):
@@ -2223,13 +2215,9 @@ def send_signal(self, sig):
         def terminate(self):
             """Terminate the process with SIGTERM
             """
-            # Lazy import to improve module import time
-            import signal
             self.send_signal(signal.SIGTERM)
 
         def kill(self):
             """Kill the process with SIGKILL
             """
-            # Lazy import to improve module import time
-            import signal
             self.send_signal(signal.SIGKILL)

Lib/test/test_asyncio/test_events.py

@@ -2889,6 +2889,22 @@ async def main():
                 self.loop.run_until_complete(main()),
                 'hello')
 
+    def test_get_running_loop_already_running(self):
+        async def main():
+            running_loop = asyncio.get_running_loop()
+            loop = asyncio.new_event_loop()
+            try:
+                loop.run_forever()
+            except RuntimeError:
+                pass
+            else:
+                self.fail("RuntimeError not raised")
+
+            self.assertIs(asyncio.get_running_loop(), running_loop)
+
+        self.loop.run_until_complete(main())
+
+
     def test_get_event_loop_returns_running_loop(self):
         class TestError(Exception):
             pass

Lib/test/test_capi/test_number.py

@@ -205,8 +205,9 @@ def test_misc_multiply(self):
         self.assertRaises(MemoryError, inplacemultiply, [1, 2], PY_SSIZE_T_MAX//2 + 1)
 
     def test_misc_power(self):
-        # PyNumber_Power()
+        # PyNumber_Power(), PyNumber_InPlacePower()
         power = _testcapi.number_power
+        inplacepower = _testcapi.number_inplacepower
 
         class HasPow(WithDunder):
             methname = '__pow__'
@@ -216,6 +217,39 @@ class HasPow(WithDunder):
         self.assertRaises(TypeError, power, 4, 11, 1.25)
         self.assertRaises(TypeError, power, 4, 11, HasPow.with_val(NotImplemented))
         self.assertRaises(TypeError, power, 4, 11, object())
+        self.assertEqual(inplacepower(4, 11, 5), pow(4, 11, 5))
+        self.assertRaises(TypeError, inplacepower, 4, 11, 1.25)
+        self.assertRaises(TypeError, inplacepower, 4, 11, object())
+
+        class X:
+            def __pow__(*args):
+                return args
+
+        x = X()
+        self.assertEqual(power(x, 11), (x, 11))
+        self.assertEqual(inplacepower(x, 11), (x, 11))
+        self.assertEqual(power(x, 11, 5), (x, 11, 5))
+        self.assertEqual(inplacepower(x, 11, 5), (x, 11, 5))
+
+        class X:
+            def __rpow__(*args):
+                return args
+
+        x = X()
+        self.assertEqual(power(4, x), (x, 4))
+        self.assertEqual(inplacepower(4, x), (x, 4))
+        # XXX: Three-arg power doesn't use __rpow__.
+        self.assertRaises(TypeError, power, 4, x, 5)
+        self.assertRaises(TypeError, inplacepower, 4, x, 5)
+
+        class X:
+            def __ipow__(*args):
+                return args
+
+        x = X()
+        self.assertEqual(inplacepower(x, 11), (x, 11))
+        # XXX: In-place power doesn't pass the third arg to __ipow__.
+        self.assertEqual(inplacepower(x, 11, 5), (x, 11))
 
     @cpython_only
     def test_rshift_print(self):

Lib/test/test_functools.py

@@ -1339,6 +1339,16 @@ def fib(n):
             self.module._CacheInfo(hits=0, misses=0, maxsize=None, currsize=0))
 
 
+class TestCachePy(TestCache, unittest.TestCase):
+    module = py_functools
+
+
+@unittest.skipUnless(c_functools, 'requires the C _functools module')
+class TestCacheC(TestCache, unittest.TestCase):
+    if c_functools:
+        module = c_functools
+
+
 class TestLRU:
 
     def test_lru(self):