Skip to content

gh-100098: [Enum] insist on actual tuples, no subclasses, for auto #100099

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.

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

Merged
merged 2 commits into from
Dec 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion Lib/enum.py
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,9 @@ def __setitem__(self, key, value):
if isinstance(value, auto):
single = True
value = (value, )
if isinstance(value, tuple):
if type(value) is tuple and any(isinstance(v, auto) for v in value):
# insist on an actual tuple, no subclasses, in keeping with only supporting
# top-level auto() usage (not contained in any other data structure)
auto_valued = []
for v in value:
if isinstance(v, auto):
Expand Down
13 changes: 13 additions & 0 deletions Lib/test/test_enum.py
Original file line number Diff line number Diff line change
Expand Up @@ -2841,6 +2841,19 @@ class MyIntFlag(IntFlag):
self.assertEqual(deep, flags)
self.assertEqual(copied.value, 1 | 2 | 8)

def test_namedtuple_as_value(self):
from collections import namedtuple
TTuple = namedtuple('TTuple', 'id a blist')
class NTEnum(Enum):
NONE = TTuple(0, 0, [])
A = TTuple(1, 2, [4])
B = TTuple(2, 4, [0, 1, 2])
self.assertEqual(repr(NTEnum.NONE), "<NTEnum.NONE: TTuple(id=0, a=0, blist=[])>")
self.assertEqual(NTEnum.NONE.value, TTuple(id=0, a=0, blist=[]))
self.assertEqual(
[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 TestOrder(unittest.TestCase):
"test usage of the `_order_` attribute"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix ``tuple`` subclasses being cast to ``tuple`` when used as enum values.