bpo-44806: Fix __init__ in subclasses of protocols (GH-27545)

Non-protocol subclasses of protocol ignore now the __init__ method
inherited from protocol base classes.
This commit is contained in:
Serhiy Storchaka 2021-08-02 19:23:22 +03:00 committed by GitHub
parent 36d952d228
commit 043cd60abe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 2 deletions

View File

@ -881,6 +881,9 @@ class ProtocolTests(BaseTestCase):
class C(P): pass
self.assertIsInstance(C(), C)
with self.assertRaises(TypeError):
C(42)
T = TypeVar('T')
class PG(Protocol[T]): pass
@ -895,6 +898,8 @@ class ProtocolTests(BaseTestCase):
class CG(PG[T]): pass
self.assertIsInstance(CG[int](), CG)
with self.assertRaises(TypeError):
CG[int](42)
def test_cannot_instantiate_abstract(self):
@runtime_checkable
@ -1322,6 +1327,37 @@ class ProtocolTests(BaseTestCase):
self.assertEqual(C[int]().test, 'OK')
class B:
def __init__(self):
self.test = 'OK'
class D1(B, P[T]):
pass
self.assertEqual(D1[int]().test, 'OK')
class D2(P[T], B):
pass
self.assertEqual(D2[int]().test, 'OK')
def test_new_called(self):
T = TypeVar('T')
class P(Protocol[T]): pass
class C(P[T]):
def __new__(cls, *args):
self = super().__new__(cls, *args)
self.test = 'OK'
return self
self.assertEqual(C[int]().test, 'OK')
with self.assertRaises(TypeError):
C[int](42)
with self.assertRaises(TypeError):
C[int](a=42)
def test_protocols_bad_subscripts(self):
T = TypeVar('T')
S = TypeVar('S')

View File

@ -1381,8 +1381,7 @@ def _is_callable_members_only(cls):
def _no_init(self, *args, **kwargs):
if type(self)._is_protocol:
raise TypeError('Protocols cannot be instantiated')
raise TypeError('Protocols cannot be instantiated')
def _caller(depth=1, default='__main__'):
try:
@ -1522,6 +1521,15 @@ class Protocol(Generic, metaclass=_ProtocolMeta):
# We have nothing more to do for non-protocols...
if not cls._is_protocol:
if cls.__init__ == _no_init:
for base in cls.__mro__:
init = base.__dict__.get('__init__', _no_init)
if init != _no_init:
cls.__init__ = init
break
else:
# should not happen
cls.__init__ = object.__init__
return
# ... otherwise check consistency of bases, and prohibit instantiation.

View File

@ -0,0 +1,2 @@
Non-protocol subclasses of :class:`typing.Protocol` ignore now the
``__init__`` method inherited from protocol base classes.