Nov 24, 2023 · Nov 23, 2023 · Nov 23, 2023 · Nov 23, 2023 · Nov 23, 2023 · Nov 23, 2023
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
            def square_norm(self) -> float:
                return self.x ** 2 + self.y ** 2

        self.assertEqual(Vec2D.__protocol_attrs__, {'x', 'y', 'square_norm'})
        expected_error_message = (
            "Protocols with non-method members don't support issubclass()."
            " Non-method members:{'x', 'y'}."
            " Non-method members:['x', 'y']."
        )
        with self.assertRaisesRegex(TypeError, re.escape(expected_error_message)):
            issubclass(int, Vec2D)

        self.assertEqual(Vec2D.__protocol_attrs__, {'x', 'y', 'square_norm'})

 class GenericTests(BaseTestCase):

diff --git a/Lib/typing.py b/Lib/typing.py
                not cls.__callable_proto_members_only__
                and cls.__dict__.get("__subclasshook__") is _proto_hook
            ):
                non_method_attrs ={
                non_method_attrs =sorted(
                    attr for attr in cls.__protocol_attrs__
                    if not callable(getattr(cls, attr, None))
 }
 )
                raise TypeError(
                    "Protocols with non-method members don't support issubclass()."
                    f" Non-method members: {non_method_attrs}."
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4099,14 +4099,14 @@ class Vec2D(Protocol):
		def square_norm(self) -> float:
		return self.x 2 + self.y 2

		self.assertEqual(Vec2D.__protocol_attrs__, {'x', 'y', 'square_norm'})
		expected_error_message = (
		"Protocols with non-method members don't support issubclass()."
		" Non-method members:{'x', 'y'}."
		" Non-method members:['x', 'y']."
randolf-scholz marked this conversation as resolved. OutdatedShow resolvedHide resolved
		)
		with self.assertRaisesRegex(TypeError, re.escape(expected_error_message)):
		issubclass(int, Vec2D)

		self.assertEqual(Vec2D.__protocol_attrs__, {'x', 'y', 'square_norm'})

		class GenericTests(BaseTestCase):

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1828,10 +1828,10 @@ def __subclasscheck__(cls, other):
		not cls.__callable_proto_members_only__
		and cls.__dict__.get("__subclasshook__") is _proto_hook
		):
		non_method_attrs ={
		non_method_attrs =sorted(
		attr for attr in cls.__protocol_attrs__
		if not callable(getattr(cls, attr, None))
		}
		)
		raise TypeError(
		"Protocols with non-method members don't support issubclass()."
		f" Non-method members: {non_method_attrs}."
randolf-scholz marked this conversation as resolved. OutdatedShow resolvedHide resolved
Expand Down