mirror of
https://github.com/python/cpython
synced 2024-10-14 11:03:18 +00:00
gh-114149: [Enum] revert #114160 and add more tuple-subclass tests (GH-114215)
This reverts commit 05e142b154
.
This commit is contained in:
parent
945540306c
commit
4c7e09d012
|
@ -250,7 +250,7 @@ def __set_name__(self, enum_class, member_name):
|
|||
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
|
||||
|
@ -1777,7 +1777,7 @@ def convert_class(cls):
|
|||
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]
|
||||
|
@ -1826,7 +1826,7 @@ def convert_class(cls):
|
|||
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]
|
||||
|
|
|
@ -3201,19 +3201,34 @@ class NTEnum(Enum):
|
|||
[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])
|
||||
|
|
Loading…
Reference in a new issue