diff options
author | Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com> | 2021-09-08 15:01:51 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-08 15:01:51 (GMT) |
commit | 99506dcbbe9fb56ceabe55f0a4333e5981b72095 (patch) | |
tree | c2aa65826f2dfc4332ed44a3a42bf1ac7e6f361f | |
parent | d9b7d427ebc1ed5cfef3657d1d92c2d80346147f (diff) | |
download | cpython-99506dcbbe9fb56ceabe55f0a4333e5981b72095.zip cpython-99506dcbbe9fb56ceabe55f0a4333e5981b72095.tar.gz cpython-99506dcbbe9fb56ceabe55f0a4333e5981b72095.tar.bz2 |
[3.9] bpo-45121: Fix RecursionError when calling Protocol.__init__ from a subclass' __init__ (GH-28206) (GH-28233)
Co-authored-by: Yurii Karabas <1998uriyyo@gmail.com>
-rw-r--r-- | Lib/test/test_typing.py | 11 | ||||
-rw-r--r-- | Lib/typing.py | 5 | ||||
-rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2021-09-07-17-10-16.bpo-45121.iG-Hsf.rst | 2 |
3 files changed, 18 insertions, 0 deletions
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index e05ac45..930f675c 100644 --- 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 9010775..775f178 100644 --- 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 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. |