Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 7 commits into from
Jan 18, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
05e142b
fix tuple subclass handling when using custom __new__
ethanfurman Jan 17, 2024
cac821f
Merge branch 'main' into enum-tuple
ethanfurman Jan 17, 2024
ece311a
Revert "fix tuple subclass handling when using custom __new__"
ethanfurman Jan 17, 2024
40b3074
Merge branch 'enum-tuple' of github.com:ethanfurman/cpython into enum…
ethanfurman Jan 17, 2024
7d0a63c
add more tuple-subclass tests
ethanfurman Jan 17, 2024
1d322ad
Merge branch 'main' into enum-tuple
ethanfurman Jan 17, 2024
5a17830
updates
ethanfurman Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions Lib/enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down
27 changes: 21 additions & 6 deletions Lib/test/test_enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down