Skip to content

Commit

Permalink
bpo-45121: Fix RecursionError when calling Protocol.__init__ from a s…
Browse files Browse the repository at this point in the history
…ubclass' __init__ (GH-28206) (GH-28232)

(cherry picked from commit c11956a)

Co-authored-by: Yurii Karabas <[email protected]>
  • Loading branch information
miss-islington and uriyyo authored Sep 8, 2021
1 parent 2fe15db commit c081649
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 0 deletions.
10 changes: 10 additions & 0 deletions Lib/test/test_typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -1604,6 +1604,16 @@ class P(Protocol):
with self.assertRaisesRegex(TypeError, "@runtime_checkable"):
isinstance(1, P)

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):

Expand Down
5 changes: 5 additions & 0 deletions Lib/typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -1404,6 +1404,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__`
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix issue where ``Protocol.__init__`` raises ``RecursionError`` when it's
called directly or via ``super()``. Patch provided by Yurii Karabas.

0 comments on commit c081649

Please sign in to comment.