summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2022-06-16 19:16:12 (GMT)
committerGitHub <noreply@github.com>2022-06-16 19:16:12 (GMT)
commit138db8e48b0bb006b1561f8ec76ade97afc6cbd7 (patch)
treecff5a81a9624b389d3201257e2a80f3747020954 /Lib
parentab45c1dde0e46603342f751552f06b8deb294832 (diff)
downloadcpython-138db8e48b0bb006b1561f8ec76ade97afc6cbd7.zip
cpython-138db8e48b0bb006b1561f8ec76ade97afc6cbd7.tar.gz
cpython-138db8e48b0bb006b1561f8ec76ade97afc6cbd7.tar.bz2
gh-93847: Fix repr of enum of generic aliases (GH-93885)
Diffstat (limited to 'Lib')
-rw-r--r--Lib/enum.py4
-rw-r--r--Lib/test/test_enum.py10
2 files changed, 12 insertions, 2 deletions
diff --git a/Lib/enum.py b/Lib/enum.py
index ee32d5d..20fad97 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -1237,7 +1237,7 @@ class Enum(metaclass=EnumType):
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):
@@ -1512,7 +1512,7 @@ class Flag(Enum, boundary=STRICT):
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 28594b0..2fadb4e 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -7,6 +7,7 @@ import pydoc
import sys
import unittest
import threading
+import typing
import builtins as bltns
from collections import OrderedDict
from datetime import date
@@ -980,6 +981,15 @@ class TestSpecial(unittest.TestCase):
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',