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

[3.11] gh-114149: [Enum] fix tuple subclass handling when using custom __new__ (GH-114160) #114197

Closed
wants to merge 1 commit into from
Closed

[3.11] gh-114149: [Enum] fix tuple subclass handling when using custom __new__ (GH-114160) #114197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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 @@ -247,7 +247,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 not isinstance(value, tuple):
if type(value) is not tuple:
args = (value, )
else:
args = value
Expand Down Expand Up @@ -1726,7 +1726,7 @@ def convert_class(cls):
else:
# create the member
if use_args:
if not isinstance(value, tuple):
if type(value) is not tuple:
value = (value, )
member = new_member(enum_class, *value)
value = value[0]
Expand Down Expand Up @@ -1773,7 +1773,7 @@ def convert_class(cls):
else:
# create the member
if use_args:
if not isinstance(value, tuple):
if type(value) is not tuple:
value = (value, )
member = new_member(enum_class, *value)
value = value[0]
Expand Down
16 changes: 16 additions & 0 deletions Lib/test/test_enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2865,6 +2865,22 @@ 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])],
)
#
class NTDEnum(Enum):
def __new__(cls, t_value):
member = object.__new__(cls)
member._value_ = t_value[0]
member.id = t_value[0]
member.a = t_value[1]
member.blist = t_value[2]
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(NTDEnum.NONE.id, 0)
self.assertEqual(NTDEnum.A.a, 2)
self.assertEqual(NTDEnum.B.blist, [0, 1 ,2])

def test_flag_with_custom_new(self):
class FlagFromChar(IntFlag):
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2024-01-16-15-59-06.gh-issue-114149.LJ8IPm.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Enum: correctly handle tuple subclasses in custom ``__new__``.
Loading