mirror of
https://github.com/python/cpython.git
synced 2025-09-17 06:06:25 +00:00
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.
(cherry picked from commit 043cd60abe
)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
parent
9de590151d
commit
2cc19a5463
3 changed files with 48 additions and 2 deletions
|
@ -875,6 +875,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
|
||||
|
@ -889,6 +892,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
|
||||
|
@ -1316,6 +1321,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')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue