[3.9] bpo-45121: Fix RecursionError when calling Protocol.__init__ from a subclass...

Co-authored-by: Yurii Karabas <1998uriyyo@gmail.com>

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index e05ac4539fb503e24b82ecad2463c549c16423d3..930f675c624ec43d74f50f55987e745d6402e8d9 100644 (file)
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -1459,6 +1459,17 @@ class ProtocolTests(BaseTestCase):
         class CustomContextManager(typing.ContextManager, Protocol):
             pass
 
+    def test_super_call_init(self):
+        class P(Protocol):
+            x: int
+
+        class Foo(P):
+            def __init__(self):
+                super().__init__()
+
+        Foo()  # Previously triggered RecursionError
+
+
 class GenericTests(BaseTestCase):
 
     def test_basics(self):

diff --git a/Lib/typing.py b/Lib/typing.py
index 9010775c0de7e11fdb14923551e185739ae0bfa5..775f17822afc1a9ab1775e1f92204cc3c8077105 100644 (file)
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -1085,6 +1085,11 @@ def _no_init_or_replace_init(self, *args, **kwargs):
     if cls._is_protocol:
         raise TypeError('Protocols cannot be instantiated')
 
+    # Already using a custom `__init__`. No need to calculate correct
+    # `__init__` to call. This can lead to RecursionError. See bpo-45121.
+    if cls.__init__ is not _no_init_or_replace_init:
+        return
+
     # Initially, `__init__` of a protocol subclass is set to `_no_init_or_replace_init`.
     # The first instantiation of the subclass will call `_no_init_or_replace_init` which
     # searches for a proper new `__init__` in the MRO. The new `__init__`

diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-09-07-17-10-16.bpo-45121.iG-Hsf.rst b/Misc/NEWS.d/next/Core and Builtins/2021-09-07-17-10-16.bpo-45121.iG-Hsf.rst
new file mode 100644 (file)
index 0000000..19eb331
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-09-07-17-10-16.bpo-45121.iG-Hsf.rst
@@ -0,0 +1,2 @@
+Fix issue where ``Protocol.__init__`` raises ``RecursionError`` when it's
+called directly or via ``super()``. Patch provided by Yurii Karabas.