[Python-checkins] gh93107: [Enum] fix missing variable in global_str (GH-93107)
ethanfurman
webhook-mailer at python.org
Mon May 23 11:56:11 EDT 2022
https://github.com/python/cpython/commit/046df59658c9f64a9f0fc909ed62e92c6c4dd668
commit: 046df59658c9f64a9f0fc909ed62e92c6c4dd668
branch: main
author: Ethan Furman <ethan at stoneleaf.us>
committer: ethanfurman <ethan at stoneleaf.us>
date: 2022-05-23T08:56:07-07:00
summary:
gh93107: [Enum] fix missing variable in global_str (GH-93107)
files:
M Lib/enum.py
M Lib/test/test_enum.py
diff --git a/Lib/enum.py b/Lib/enum.py
index 1df38a6f7e5f5..62fd5ce8fb9a0 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -1640,6 +1640,7 @@ def global_str(self):
use enum_name instead of class.enum_name
"""
if self._name_ is None:
+ cls_name = self.__class__.__name__
return "%s(%r)" % (cls_name, self._value_)
else:
return self._name_
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index 286d631d793e4..44a3912630c32 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -189,6 +189,12 @@ class HeadlightsC(IntFlag, boundary=enum.CONFORM):
FOG_C = auto()
+ at enum.global_enum
+class NoName(Flag):
+ ONE = 1
+ TWO = 2
+
+
# tests
class _EnumTests:
@@ -616,6 +622,7 @@ class _PlainOutputTests:
def test_str(self):
TE = self.MainEnum
if self.is_flag:
+ self.assertEqual(str(TE(0)), "MainEnum(0)")
self.assertEqual(str(TE.dupe), "MainEnum.dupe")
self.assertEqual(str(self.dupe2), "MainEnum.first|third")
else:
@@ -3242,6 +3249,10 @@ def test_global_repr_conform1(self):
'%(m)s.OFF_C' % {'m': SHORT_MODULE},
)
+ def test_global_enum_str(self):
+ self.assertEqual(str(NoName.ONE & NoName.TWO), 'NoName(0)')
+ self.assertEqual(str(NoName(0)), 'NoName(0)')
+
def test_format(self):
Perm = self.Perm
self.assertEqual(format(Perm.R, ''), '4')
More information about the Python-checkins
mailing list