Commite9d1360

and

authored

gh-112345:typing.Protocol: Let failed subclasscheck show non-method members (#112344)

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

1 parentd9fc152 commite9d1360Copy full SHA for e9d1360

File tree

+25

-1

lines changed

+25

-1

lines changed

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4091,6 +4091,22 @@ def method(self) -> None: ...`
`4091`	`4091`	`self.assertIsInstance(Foo(),ProtocolWithMixedMembers)`
`4092`	`4092`	`self.assertNotIsInstance(42,ProtocolWithMixedMembers)`
`4093`	`4093`
	`4094`	`+deftest_protocol_issubclass_error_message(self):`
	`4095`	`+classVec2D(Protocol):`
	`4096`	`+x:float`
	`4097`	`+y:float`
	`4098`	`+`
	`4099`	`+defsquare_norm(self)->float:`
	`4100`	`+returnself.x2+self.y2`
	`4101`	`+`
	`4102`	`+self.assertEqual(Vec2D.__protocol_attrs__, {'x','y','square_norm'})`
	`4103`	`+expected_error_message= (`
	`4104`	`+"Protocols with non-method members don't support issubclass()."`
	`4105`	`+" Non-method members: 'x', 'y'."`
	`4106`	`+ )`
	`4107`	`+withself.assertRaisesRegex(TypeError,re.escape(expected_error_message)):`
	`4108`	`+issubclass(int,Vec2D)`
	`4109`	`+`
`4094`	`4110`
`4095`	`4111`	`classGenericTests(BaseTestCase):`
`4096`	`4112`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1828,8 +1828,13 @@ def __subclasscheck__(cls, other):`
`1828`	`1828`	`notcls.__callable_proto_members_only__`
`1829`	`1829`	`andcls.__dict__.get("__subclasshook__")is_proto_hook`
`1830`	`1830`	`):`
	`1831`	`+non_method_attrs=sorted(`
	`1832`	`+attrforattrincls.__protocol_attrs__`
	`1833`	`+ifnotcallable(getattr(cls,attr,None))`
	`1834`	`+ )`
`1831`	`1835`	`raiseTypeError(`
`1832`		`-"Protocols with non-method members don't support issubclass()"`
	`1836`	`+"Protocols with non-method members don't support issubclass()."`
	`1837`	`+f" Non-method members:{str(non_method_attrs)[1:-1]}."`
`1833`	`1838`	`)`
`1834`	`1839`	`ifnotgetattr(cls,'_is_runtime_protocol',False):`
`1835`	`1840`	`raiseTypeError(`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Improve error message when trying to call:func:`issubclass` against a
	`2`	+:class:`typing.Protocol` that has non-method members.
	`3`	`+Patch by Randolf Scholz.`

Comments

(0)