mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[3.12] gh-114149: [Enum] revert GH-114196 and add more tuple-subclass tests (GH-114215) (GH-114218)

Browse source 
gh-114149: [Enum] revert GH-114160 and add more tuple-subclass tests (GH-114215)

This reverts commit 05e142b154.
(cherry picked from commit 4c7e09d012)

Co-authored-by: Ethan Furman <ethan@stoneleaf.us>
This commit is contained in:
Miss Islington (bot) 2024-01-18 05:36:28 +01:00 • committed by GitHub
parent 87198f6c23
commit 35e330ba85
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/enum.py
View file

@ -254,7 +254,7 @@ class _proto_member:
delattr(enum_class, member_name)
# second step: create member based on enum_class
value = self.value
if type(value) is not tuple:
if not isinstance(value, tuple):
args = (value, )
else:
args = value
@ -1757,7 +1757,7 @@ def _simple_enum(etype=Enum, *, boundary=None, use_args=None):
else:
# create the member
if use_args:
if type(value) is not tuple:
if not isinstance(value, tuple):
value = (value, )
member = new_member(enum_class, *value)
value = value[0]
@ -1807,7 +1807,7 @@ def _simple_enum(etype=Enum, *, boundary=None, use_args=None):
else:
# create the member
if use_args:
if type(value) is not tuple:
if not isinstance(value, tuple):
value = (value, )
member = new_member(enum_class, *value)
value = value[0]

27
Lib/test/test_enum.py
View file

@ -3163,19 +3163,34 @@ class TestSpecial(unittest.TestCase):
[x.value for x in NTEnum],
[TTuple(id=0, a=0, blist=[]), TTuple(id=1, a=2, blist=[4]), TTuple(id=2, a=4, blist=[0, 1, 2])],
)
self.assertRaises(AttributeError, getattr, NTEnum.NONE, 'id')
#
class NTCEnum(TTuple, Enum):
NONE = 0, 0, []
A = 1, 2, [4]
B = 2, 4, [0, 1, 2]
self.assertEqual(repr(NTCEnum.NONE), "<NTCEnum.NONE: TTuple(id=0, a=0, blist=[])>")
self.assertEqual(NTCEnum.NONE.value, TTuple(id=0, a=0, blist=[]))
self.assertEqual(NTCEnum.NONE.id, 0)
self.assertEqual(NTCEnum.A.a, 2)
self.assertEqual(NTCEnum.B.blist, [0, 1 ,2])
self.assertEqual(
[x.value for x in NTCEnum],
[TTuple(id=0, a=0, blist=[]), TTuple(id=1, a=2, blist=[4]), TTuple(id=2, a=4, blist=[0, 1, 2])],
)
#
class NTDEnum(Enum):
def __new__(cls, t_value):
def __new__(cls, id, a, blist):
member = object.__new__(cls)
member._value_ = t_value[0]
member.id = t_value[0]
member.a = t_value[1]
member.blist = t_value[2]
member.id = id
member.a = a
member.blist = blist
return member
NONE = TTuple(0, 0, [])
A = TTuple(1, 2, [4])
B = TTuple(2, 4, [0, 1, 2])
self.assertEqual(repr(NTDEnum.NONE), "<NTDEnum.NONE: 0>")
self.assertEqual(repr(NTDEnum.NONE), "<NTDEnum.NONE: TTuple(id=0, a=0, blist=[])>")
self.assertEqual(NTDEnum.NONE.id, 0)
self.assertEqual(NTDEnum.A.a, 2)
self.assertEqual(NTDEnum.B.blist, [0, 1 ,2])