From 4fda2eccc57b2bceb8beeb3ad163c75b68a5ef91 Mon Sep 17 00:00:00 2001 From: Martin Rueckl Date: Wed, 27 Oct 2021 23:36:41 +0200 Subject: [PATCH] bpo-45438: format of inspect.Signature with generic builtins (GH-29212) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit d02ffd1b5c0fd8dec6dd2f7e3f2b0cfae48b7899) Co-authored-by: Martin Rueckl --- Lib/inspect.py | 2 ++ Lib/test/test_inspect.py | 11 +++++++++++ .../Library/2021-10-27-10-05-39.bpo-45438.Xz5lGU.rst | 1 + 3 files changed, 14 insertions(+) create mode 100644 Misc/NEWS.d/next/Library/2021-10-27-10-05-39.bpo-45438.Xz5lGU.rst diff --git a/Lib/inspect.py b/Lib/inspect.py index 976cbb1a234e44..64605c3cd3f6f3 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -1233,6 +1233,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 17c5d87f8ab457..8a8844e912ad21 100644 --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -3200,6 +3200,17 @@ def foo(): 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 00000000000000..cd6cfc1fcd4079 --- /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.