From: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com>
Date: Wed, 25 Aug 2021 18:13:59 +0000 (+0800)
Subject: bpo-44524: Don't modify MRO when inheriting from typing.Annotated (GH-27841)
X-Git-Tag: v3.11.0a1~335
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23384a1749359f0ae7aaae052073d44b59e715a1;p=thirdparty%2FPython%2Fcpython.git

bpo-44524: Don't modify MRO when inheriting from typing.Annotated (GH-27841)
---

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index de4db51bdc70..847d583cdafb 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -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):
diff --git a/Lib/typing.py b/Lib/typing.py
index a283fe40d2d3..35c57c21b37c 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -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.