From: Yurii Karabas <1998uriyyo@gmail.com> Date: Wed, 18 Aug 2021 19:08:32 +0000 (+0300) Subject: bpo-44524: Fix cryptic TypeError message when trying to subclass special forms in... X-Git-Tag: v3.11.0a1~387 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3a4d20d6798aa2975428d51f3a4f890248810cb;p=thirdparty%2FPython%2Fcpython.git bpo-44524: Fix cryptic TypeError message when trying to subclass special forms in `typing` (GH-27710) This was a Python 3.9 regression. --- diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index 06141f8bbcb6..d090c5f8818d 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -2424,6 +2424,22 @@ class GenericTests(BaseTestCase): self.assertEqual(c.from_b, 'b') self.assertEqual(c.from_c, 'c') + def test_subclass_special_form(self): + for obj in ( + ClassVar[int], + Final[int], + Union[int, float], + Optional[int], + Literal[1, 2], + Concatenate[int, ParamSpec("P")], + TypeGuard[int], + ): + with self.subTest(msg=obj): + with self.assertRaisesRegex( + TypeError, f'^{re.escape(f"Cannot subclass {obj!r}")}$' + ): + class Foo(obj): + pass class ClassVarTests(BaseTestCase): diff --git a/Lib/typing.py b/Lib/typing.py index 51468aeaf5b7..eeeb295b6c2c 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -1086,6 +1086,9 @@ class _GenericAlias(_BaseGenericAlias, _root=True): return operator.getitem, (origin, args) def __mro_entries__(self, bases): + if isinstance(self.__origin__, _SpecialForm): + raise TypeError(f"Cannot subclass {self!r}") + if self._name: # generic version of an ABC or built-in class return super().__mro_entries__(bases) if self.__origin__ is Generic: diff --git a/Misc/NEWS.d/next/Library/2021-08-10-16-57-10.bpo-44524.dk9QX4.rst b/Misc/NEWS.d/next/Library/2021-08-10-16-57-10.bpo-44524.dk9QX4.rst new file mode 100644 index 000000000000..bc3659fca520 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-08-10-16-57-10.bpo-44524.dk9QX4.rst @@ -0,0 +1,2 @@ +Make exception message more useful when subclass from typing special form +alias. Patch provided by Yurii Karabas.