1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 05e142b1543eb9662d6cc33722e7e16250c9219f.
This commit is contained in:
Ethan Furman 2024-01-17 16:31:00 -08:00 committed by GitHub
parent 945540306c
commit 4c7e09d012
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/enum.py
View File

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

27
Lib/test/test_enum.py
View File

@ -3201,19 +3201,34 @@ class TestSpecial(unittest.TestCase):
[x.value for x in NTEnum], [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])], [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): class NTDEnum(Enum):
def __new__(cls, t_value): def __new__(cls, id, a, blist):
member = object.__new__(cls) member = object.__new__(cls)
member._value_ = t_value[0] member.id = id
member.id = t_value[0] member.a = a
member.a = t_value[1] member.blist = blist
member.blist = t_value[2]
return member return member
NONE = TTuple(0, 0, []) NONE = TTuple(0, 0, [])
A = TTuple(1, 2, [4]) A = TTuple(1, 2, [4])
B = TTuple(2, 4, [0, 1, 2]) 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.NONE.id, 0)
self.assertEqual(NTDEnum.A.a, 2) self.assertEqual(NTDEnum.A.a, 2)
self.assertEqual(NTDEnum.B.blist, [0, 1 ,2]) self.assertEqual(NTDEnum.B.blist, [0, 1 ,2])