Skip to content

Commit ded02ca

Browse files
authored
gh-100098: [Enum] insist on actual tuples, no subclasses, for auto (GH-100099)
When checking for auto() instances, only top-level usage is supported, which means either alone or as part of a regular tuple. Other containers, such as lists, dicts, or namedtuples, will not have auto() transformed into a value.
1 parent cce8362 commit ded02ca

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

Lib/enum.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,9 @@ def __setitem__(self, key, value):
436436
if isinstance(value, auto):
437437
single = True
438438
value = (value, )
439-
if isinstance(value, tuple):
439+
if type(value) is tuple and any(isinstance(v, auto) for v in value):
440+
# insist on an actual tuple, no subclasses, in keeping with only supporting
441+
# top-level auto() usage (not contained in any other data structure)
440442
auto_valued = []
441443
for v in value:
442444
if isinstance(v, auto):

Lib/test/test_enum.py

+13
Original file line numberDiff line numberDiff line change
@@ -2841,6 +2841,19 @@ class MyIntFlag(IntFlag):
28412841
self.assertEqual(deep, flags)
28422842
self.assertEqual(copied.value, 1 | 2 | 8)
28432843

2844+
def test_namedtuple_as_value(self):
2845+
from collections import namedtuple
2846+
TTuple = namedtuple('TTuple', 'id a blist')
2847+
class NTEnum(Enum):
2848+
NONE = TTuple(0, 0, [])
2849+
A = TTuple(1, 2, [4])
2850+
B = TTuple(2, 4, [0, 1, 2])
2851+
self.assertEqual(repr(NTEnum.NONE), "<NTEnum.NONE: TTuple(id=0, a=0, blist=[])>")
2852+
self.assertEqual(NTEnum.NONE.value, TTuple(id=0, a=0, blist=[]))
2853+
self.assertEqual(
2854+
[x.value for x in NTEnum],
2855+
[TTuple(id=0, a=0, blist=[]), TTuple(id=1, a=2, blist=[4]), TTuple(id=2, a=4, blist=[0, 1, 2])],
2856+
)
28442857

28452858
class TestOrder(unittest.TestCase):
28462859
"test usage of the `_order_` attribute"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix ``tuple`` subclasses being cast to ``tuple`` when used as enum values.

0 commit comments

Comments
 (0)