From fb8aad16401e081a6a9059c7b428f7e8aae85d58 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Fri, 10 Dec 2021 01:42:49 -0800 Subject: [PATCH] [3.9] bpo-45662: Fix the repr of InitVar with a type alias to the built-in class (GH-29291) (GH-29924) For example, InitVar[list[int]]. (cherry picked from commit 1fd4de5bddbbf2a97cdbac4d298c89e1156bdc6c) Co-authored-by: Serhiy Storchaka --- Lib/dataclasses.py | 2 +- Lib/test/test_dataclasses.py | 2 ++ .../next/Library/2021-10-28-22-58-14.bpo-45662.sJd7Ir.rst | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2021-10-28-22-58-14.bpo-45662.sJd7Ir.rst diff --git a/Lib/dataclasses.py b/Lib/dataclasses.py index 68907058403f..5ff67ad2ea9e 100644 --- a/Lib/dataclasses.py +++ b/Lib/dataclasses.py @@ -207,7 +207,7 @@ class InitVar: self.type = type def __repr__(self): - if isinstance(self.type, type): + if isinstance(self.type, type) and not isinstance(self.type, GenericAlias): type_name = self.type.__name__ else: # typing objects, e.g. List[int] diff --git a/Lib/test/test_dataclasses.py b/Lib/test/test_dataclasses.py index fa5adfcea1b4..9b6013456eb6 100644 --- a/Lib/test/test_dataclasses.py +++ b/Lib/test/test_dataclasses.py @@ -1125,6 +1125,8 @@ class TestCase(unittest.TestCase): self.assertEqual(repr(InitVar[int]), 'dataclasses.InitVar[int]') self.assertEqual(repr(InitVar[List[int]]), 'dataclasses.InitVar[typing.List[int]]') + self.assertEqual(repr(InitVar[list[int]]), + 'dataclasses.InitVar[list[int]]') def test_init_var_inheritance(self): # Note that this deliberately tests that a dataclass need not diff --git a/Misc/NEWS.d/next/Library/2021-10-28-22-58-14.bpo-45662.sJd7Ir.rst b/Misc/NEWS.d/next/Library/2021-10-28-22-58-14.bpo-45662.sJd7Ir.rst new file mode 100644 index 000000000000..050b443dd7cb --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-10-28-22-58-14.bpo-45662.sJd7Ir.rst @@ -0,0 +1,2 @@ +Fix the repr of :data:`dataclasses.InitVar` with a type alias to the +built-in class, e.g. ``InitVar[list[int]]``. -- 2.47.3