Skip to content

Commit 33b47a2

Browse files
authored
gh-114149: [Enum] fix tuple subclass handling when using custom __new__ (GH-114160)
1 parent 029ecee commit 33b47a2

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

Lib/enum.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ def __set_name__(self, enum_class, member_name):
250250
delattr(enum_class, member_name)
251251
# second step: create member based on enum_class
252252
value = self.value
253-
if not isinstance(value, tuple):
253+
if type(value) is not tuple:
254254
args = (value, )
255255
else:
256256
args = value
@@ -1777,7 +1777,7 @@ def convert_class(cls):
17771777
else:
17781778
# create the member
17791779
if use_args:
1780-
if not isinstance(value, tuple):
1780+
if type(value) is not tuple:
17811781
value = (value, )
17821782
member = new_member(enum_class, *value)
17831783
value = value[0]
@@ -1826,7 +1826,7 @@ def convert_class(cls):
18261826
else:
18271827
# create the member
18281828
if use_args:
1829-
if not isinstance(value, tuple):
1829+
if type(value) is not tuple:
18301830
value = (value, )
18311831
member = new_member(enum_class, *value)
18321832
value = value[0]

Lib/test/test_enum.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3201,6 +3201,22 @@ class NTEnum(Enum):
32013201
[x.value for x in NTEnum],
32023202
[TTuple(id=0, a=0, blist=[]), TTuple(id=1, a=2, blist=[4]), TTuple(id=2, a=4, blist=[0, 1, 2])],
32033203
)
3204+
#
3205+
class NTDEnum(Enum):
3206+
def __new__(cls, t_value):
3207+
member = object.__new__(cls)
3208+
member._value_ = t_value[0]
3209+
member.id = t_value[0]
3210+
member.a = t_value[1]
3211+
member.blist = t_value[2]
3212+
return member
3213+
NONE = TTuple(0, 0, [])
3214+
A = TTuple(1, 2, [4])
3215+
B = TTuple(2, 4, [0, 1, 2])
3216+
self.assertEqual(repr(NTDEnum.NONE), "<NTDEnum.NONE: 0>")
3217+
self.assertEqual(NTDEnum.NONE.id, 0)
3218+
self.assertEqual(NTDEnum.A.a, 2)
3219+
self.assertEqual(NTDEnum.B.blist, [0, 1 ,2])
32043220

32053221
def test_flag_with_custom_new(self):
32063222
class FlagFromChar(IntFlag):
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Enum: correctly handle tuple subclasses in custom ``__new__``.

0 commit comments

Comments
 (0)