]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-44524: Don't modify MRO when inheriting from typing.Annotated (GH-27841)
authorKen Jin <28750310+Fidget-Spinner@users.noreply.github.com>
Wed, 25 Aug 2021 18:13:59 +0000 (02:13 +0800)
committerGitHub <noreply@github.com>
Wed, 25 Aug 2021 18:13:59 +0000 (21:13 +0300)
Lib/test/test_typing.py
Lib/typing.py

index de4db51bdc70759ec18c4c1d0029ca4430861b3b..847d583cdafb9a8812c0d384542643617104db10 100644 (file)
@@ -4568,6 +4568,11 @@ class AnnotatedTests(BaseTestCase):
         X = List[Annotated[T, 5]]
         self.assertEqual(X[int], List[Annotated[int, 5]])
 
+    def test_annotated_mro(self):
+        class X(Annotated[int, (1, 10)]): ...
+        self.assertEqual(X.__mro__, (X, int, object),
+                         "Annotated should be transparent.")
+
 
 class TypeAliasTests(BaseTestCase):
     def test_canonical_usage_with_variable_annotation(self):
index a283fe40d2d3ffc6438f995e2167a8999c9ed191..35c57c21b37c2146750812eb64a3bfe2fd7606e4 100644 (file)
@@ -1575,7 +1575,7 @@ class _AnnotatedAlias(_GenericAlias, _root=True):
         if isinstance(origin, _AnnotatedAlias):
             metadata = origin.__metadata__ + metadata
             origin = origin.__origin__
-        super().__init__(origin, origin, name="Annotated")
+        super().__init__(origin, origin)
         self.__metadata__ = metadata
 
     def copy_with(self, params):
@@ -1603,6 +1603,11 @@ class _AnnotatedAlias(_GenericAlias, _root=True):
     def __hash__(self):
         return hash((self.__origin__, self.__metadata__))
 
+    def __getattr__(self, attr):
+        if attr in {'__name__', '__qualname__'}:
+            return 'Annotated'
+        return super().__getattr__(attr)
+
 
 class Annotated:
     """Add context specific metadata to a type.