https://github.com/python/cpython/commit/35e330ba859c915043d2e9808b44120f67328873 commit: 35e330ba859c915043d2e9808b44120f67328873 branch: 3.12 author: Miss Islington (bot) <[email protected]> committer: ethanfurman <[email protected]> date: 2024-01-17T20:36:28-08:00 summary:
[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 05e142b1543eb9662d6cc33722e7e16250c9219f. (cherry picked from commit 4c7e09d0129dafddba58979ced9580f856f65efa) Co-authored-by: Ethan Furman <[email protected]> files: M Lib/enum.py M Lib/test/test_enum.py diff --git a/Lib/enum.py b/Lib/enum.py index 0cf88471d504a2..1502bfe9158520 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -254,7 +254,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 @@ -1757,7 +1757,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] @@ -1807,7 +1807,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] diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index 2db3b2f95fc845..23be142c24de0f 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -3163,19 +3163,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]) _______________________________________________ Python-checkins mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3/lists/python-checkins.python.org/ Member address: [email protected]
