Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-74690: Don't set special protocol attributes on non-protocol subclasses of protocols (#104622) 

Don't set special protocol attributes on non-protocol subclasses of protocols
This commit is contained in:
Alex Waygood 2023-05-19 00:34:40 +01:00 committed by GitHub
parent aab2a366b7
commit f7835fc7e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/test/test_typing.py
View File

@ -3167,6 +3167,21 @@ class ProtocolTests(BaseTestCase):
self.assertIsInstance(NonPR(), PR)
self.assertIsSubclass(NonPR, PR)
self.assertNotIn("__protocol_attrs__", vars(NonP))
self.assertNotIn("__protocol_attrs__", vars(NonPR))
self.assertNotIn("__callable_proto_members_only__", vars(NonP))
self.assertNotIn("__callable_proto_members_only__", vars(NonPR))
acceptable_extra_attrs = {
'_is_protocol', '_is_runtime_protocol', '__parameters__',
'__subclasshook__', '__abstractmethods__', '_abc_impl',
'__init__', '__annotations__',
}
self.assertLessEqual(vars(NonP).keys(), vars(C).keys() | acceptable_extra_attrs)
self.assertLessEqual(
vars(NonPR).keys(), vars(D).keys() | acceptable_extra_attrs
)
def test_custom_subclasshook(self):
class P(Protocol):
x = 1

13
Lib/typing.py
View File

@ -1779,12 +1779,13 @@ class _ProtocolMeta(ABCMeta):
# but is necessary for several reasons...
def __init__(cls, *args, **kwargs):
super().__init__(*args, **kwargs)
cls.__protocol_attrs__ = _get_protocol_attrs(cls)
# PEP 544 prohibits using issubclass()
# with protocols that have non-method members.
cls.__callable_proto_members_only__ = all(
callable(getattr(cls, attr, None)) for attr in cls.__protocol_attrs__
)
if getattr(cls, "_is_protocol", False):
cls.__protocol_attrs__ = _get_protocol_attrs(cls)
# PEP 544 prohibits using issubclass()
# with protocols that have non-method members.
cls.__callable_proto_members_only__ = all(
callable(getattr(cls, attr, None)) for attr in cls.__protocol_attrs__
)
def __subclasscheck__(cls, other):
if (