Skip to content

Commit 35e330b

Browse files
[3.12] gh-114149: [Enum] revert GH-114196 and add more tuple-subclass tests (GH-114215) (GH-114218)
gh-114149: [Enum] revert GH-114160 and add more tuple-subclass tests (GH-114215) This reverts commit 05e142b. (cherry picked from commit 4c7e09d) Co-authored-by: Ethan Furman <[email protected]>
1 parent 87198f6 commit 35e330b

File tree

2 files changed

+24
-9
lines changed

2 files changed

+24
-9
lines changed

Lib/enum.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ def __set_name__(self, enum_class, member_name):
254254
delattr(enum_class, member_name)
255255
# second step: create member based on enum_class
256256
value = self.value
257-
if type(value) is not tuple:
257+
if not isinstance(value, tuple):
258258
args = (value, )
259259
else:
260260
args = value
@@ -1757,7 +1757,7 @@ def convert_class(cls):
17571757
else:
17581758
# create the member
17591759
if use_args:
1760-
if type(value) is not tuple:
1760+
if not isinstance(value, tuple):
17611761
value = (value, )
17621762
member = new_member(enum_class, *value)
17631763
value = value[0]
@@ -1807,7 +1807,7 @@ def convert_class(cls):
18071807
else:
18081808
# create the member
18091809
if use_args:
1810-
if type(value) is not tuple:
1810+
if not isinstance(value, tuple):
18111811
value = (value, )
18121812
member = new_member(enum_class, *value)
18131813
value = value[0]

Lib/test/test_enum.py

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3163,19 +3163,34 @@ class NTEnum(Enum):
31633163
[x.value for x in NTEnum],
31643164
[TTuple(id=0, a=0, blist=[]), TTuple(id=1, a=2, blist=[4]), TTuple(id=2, a=4, blist=[0, 1, 2])],
31653165
)
3166+
3167+
self.assertRaises(AttributeError, getattr, NTEnum.NONE, 'id')
3168+
#
3169+
class NTCEnum(TTuple, Enum):
3170+
NONE = 0, 0, []
3171+
A = 1, 2, [4]
3172+
B = 2, 4, [0, 1, 2]
3173+
self.assertEqual(repr(NTCEnum.NONE), "<NTCEnum.NONE: TTuple(id=0, a=0, blist=[])>")
3174+
self.assertEqual(NTCEnum.NONE.value, TTuple(id=0, a=0, blist=[]))
3175+
self.assertEqual(NTCEnum.NONE.id, 0)
3176+
self.assertEqual(NTCEnum.A.a, 2)
3177+
self.assertEqual(NTCEnum.B.blist, [0, 1 ,2])
3178+
self.assertEqual(
3179+
[x.value for x in NTCEnum],
3180+
[TTuple(id=0, a=0, blist=[]), TTuple(id=1, a=2, blist=[4]), TTuple(id=2, a=4, blist=[0, 1, 2])],
3181+
)
31663182
#
31673183
class NTDEnum(Enum):
3168-
def __new__(cls, t_value):
3184+
def __new__(cls, id, a, blist):
31693185
member = object.__new__(cls)
3170-
member._value_ = t_value[0]
3171-
member.id = t_value[0]
3172-
member.a = t_value[1]
3173-
member.blist = t_value[2]
3186+
member.id = id
3187+
member.a = a
3188+
member.blist = blist
31743189
return member
31753190
NONE = TTuple(0, 0, [])
31763191
A = TTuple(1, 2, [4])
31773192
B = TTuple(2, 4, [0, 1, 2])
3178-
self.assertEqual(repr(NTDEnum.NONE), "<NTDEnum.NONE: 0>")
3193+
self.assertEqual(repr(NTDEnum.NONE), "<NTDEnum.NONE: TTuple(id=0, a=0, blist=[])>")
31793194
self.assertEqual(NTDEnum.NONE.id, 0)
31803195
self.assertEqual(NTDEnum.A.a, 2)
31813196
self.assertEqual(NTDEnum.B.blist, [0, 1 ,2])

0 commit comments

Comments
 (0)