diff options
author | Alex Waygood <Alex.Waygood@Gmail.com> | 2023-05-16 16:38:10 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-16 16:38:10 (GMT) |
commit | 1163782868454287ca9ac170aaebca4beeb83192 (patch) | |
tree | 99dbc1179ab5ac328ae1b08c488e0625e065507a | |
parent | f40890b124a330b589c8093127be1274e15dbd7f (diff) | |
download | cpython-1163782868454287ca9ac170aaebca4beeb83192.zip cpython-1163782868454287ca9ac170aaebca4beeb83192.tar.gz cpython-1163782868454287ca9ac170aaebca4beeb83192.tar.bz2 |
gh-104555: Fix isinstance() and issubclass() for runtime-checkable protocols that use PEP 695 (#104556)
Fixes #104555
-rw-r--r-- | Lib/test/test_typing.py | 18 | ||||
-rw-r--r-- | Lib/typing.py | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index 71aff87..0cd67c5 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -3134,6 +3134,24 @@ class ProtocolTests(BaseTestCase): self.assertIsInstance(Test(), PSub) + def test_pep695_generic_protocol_callable_members(self): + @runtime_checkable + class Foo[T](Protocol): + def meth(self, x: T) -> None: ... + + class Bar[T]: + def meth(self, x: T) -> None: ... + + self.assertIsInstance(Bar(), Foo) + self.assertIsSubclass(Bar, Foo) + + @runtime_checkable + class SupportsTrunc[T](Protocol): + def __trunc__(self) -> T: ... + + self.assertIsInstance(0.0, SupportsTrunc) + self.assertIsSubclass(float, SupportsTrunc) + def test_init_called(self): T = TypeVar('T') diff --git a/Lib/typing.py b/Lib/typing.py index 8d132e2..50a8f51 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -1663,7 +1663,7 @@ class _TypingEllipsis: _TYPING_INTERNALS = frozenset({ '__parameters__', '__orig_bases__', '__orig_class__', '_is_protocol', '_is_runtime_protocol', '__protocol_attrs__', - '__callable_proto_members_only__', + '__callable_proto_members_only__', '__type_params__', }) _SPECIAL_NAMES = frozenset({ |