From: Martin Rueckl <enigma@nbubu.de>
Date: Wed, 27 Oct 2021 21:36:41 +0000 (+0200)
Subject: bpo-45438: format of inspect.Signature with generic builtins (#29212)
X-Git-Tag: v3.11.0a2~75
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d02ffd1b5c0fd8dec6dd2f7e3f2b0cfae48b7899;p=thirdparty%2FPython%2Fcpython.git

bpo-45438: format of inspect.Signature with generic builtins (#29212)

Use types.GenericAlias in inspect.formatannotation to correctly add
type arguments of builtin types to the string representation of
Signatures.

Co-authored-by: Martin Rückl <martin.rueckl@codecentric.de>
---

diff --git a/Lib/inspect.py b/Lib/inspect.py
index a956acf310f8..14a42fda56c6 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -1325,6 +1325,8 @@ def getargvalues(frame):
 def formatannotation(annotation, base_module=None):
     if getattr(annotation, '__module__', None) == 'typing':
         return repr(annotation).replace('typing.', '')
+    if isinstance(annotation, types.GenericAlias):
+        return str(annotation)
     if isinstance(annotation, type):
         if annotation.__module__ in ('builtins', base_module):
             return annotation.__qualname__
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index 516efac45e52..7479eb326e6f 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -3236,6 +3236,17 @@ class TestSignatureObject(unittest.TestCase):
             pass
         self.assertEqual(str(inspect.signature(foo)), '()')
 
+        def foo(a: list[str]) -> tuple[str, float]:
+            pass
+        self.assertEqual(str(inspect.signature(foo)),
+                         '(a: list[str]) -> tuple[str, float]')
+
+        from typing import Tuple
+        def foo(a: list[str]) -> Tuple[str, float]:
+            pass
+        self.assertEqual(str(inspect.signature(foo)),
+                         '(a: list[str]) -> Tuple[str, float]')
+
     def test_signature_str_positional_only(self):
         P = inspect.Parameter
         S = inspect.Signature
diff --git a/Misc/NEWS.d/next/Library/2021-10-27-10-05-39.bpo-45438.Xz5lGU.rst b/Misc/NEWS.d/next/Library/2021-10-27-10-05-39.bpo-45438.Xz5lGU.rst
new file mode 100644
index 000000000000..cd6cfc1fcd40
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-10-27-10-05-39.bpo-45438.Xz5lGU.rst
@@ -0,0 +1 @@
+Fix typing.Signature string representation for generic builtin types.