[Python-checkins] gh-93847: Fix repr of enum of generic aliases (GH-93885)

Fri Jun 17 01:00:31 EDT 2022

https://github.com/python/cpython/commit/0319052090721a966892ee1384ce1246f09f7020
commit: 0319052090721a966892ee1384ce1246f09f7020
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022年06月16日T22:00:22-07:00
summary:
gh-93847: Fix repr of enum of generic aliases (GH-93885)
(cherry picked from commit 138db8e48b0bb006b1561f8ec76ade97afc6cbd7)
Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>
files:
A Misc/NEWS.d/next/Library/2022-06-16-09-24-50.gh-issue-93847.kuv8bN.rst
M Lib/enum.py
M Lib/test/test_enum.py

diff --git a/Lib/enum.py b/Lib/enum.py
index 091acb3e7f343..1dc3a0e5dc4d8 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -1240,7 +1240,7 @@ def _missing_(cls, value):
 return None
 
 def __repr__(self):
- v_repr = self.__class__._value_repr_ or self._value_.__class__.__repr__
+ v_repr = self.__class__._value_repr_ or repr
 return "<%s.%s: %s>" % (self.__class__.__name__, self._name_, v_repr(self._value_))
 
 def __str__(self):
@@ -1515,7 +1515,7 @@ def __len__(self):
 
 def __repr__(self):
 cls_name = self.__class__.__name__
- v_repr = self.__class__._value_repr_ or self._value_.__class__.__repr__
+ v_repr = self.__class__._value_repr_ or repr
 if self._name_ is None:
 return "<%s: %s>" % (cls_name, v_repr(self._value_))
 else:
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index b44c5664e5104..66c77675cf352 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -7,6 +7,7 @@
 import sys
 import unittest
 import threading
+import typing
 import builtins as bltns
 from collections import OrderedDict
 from datetime import date
@@ -978,6 +979,15 @@ class SpamEnum(Enum):
 spam = SpamEnumNotInner
 self.assertEqual(SpamEnum.spam.value, SpamEnumNotInner)
 
+ def test_enum_of_generic_aliases(self):
+ class E(Enum):
+ a = typing.List[int]
+ b = list[int]
+ self.assertEqual(E.a.value, typing.List[int])
+ self.assertEqual(E.b.value, list[int])
+ self.assertEqual(repr(E.a), '<E.a: typing.List[int]>')
+ self.assertEqual(repr(E.b), '<E.b: list[int]>')
+
 @unittest.skipIf(
 python_version >= (3, 13),
 'inner classes are not members',
diff --git a/Misc/NEWS.d/next/Library/2022-06-16-09-24-50.gh-issue-93847.kuv8bN.rst b/Misc/NEWS.d/next/Library/2022-06-16-09-24-50.gh-issue-93847.kuv8bN.rst
new file mode 100644
index 0000000000000..c6947575e67e1
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-06-16-09-24-50.gh-issue-93847.kuv8bN.rst
@@ -0,0 +1 @@
+Fix repr of enum of generic aliases.
