mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-93464: [Enum] fix auto() failure during multiple assignment (GH-99148)

Browse source 
* fix auto() failure during multiple assignment

i.e. `ONE = auto(), 'text'` will now have `ONE' with the value of `(1,
'text')`.  Before it would have been `(<an auto instance>, 'text')`
This commit is contained in:
Ethan Furman 2022-11-05 18:01:08 -07:00 • committed by GitHub
parent 586b07e1f9
commit 8feb7ab77c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 82 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Lib/test/test_enum.py
View file

@ -4116,6 +4116,50 @@ class TestInternals(unittest.TestCase):
third = auto()
self.assertEqual([Dupes.first, Dupes.second, Dupes.third], list(Dupes))
def test_multiple_auto_on_line(self):
class Huh(Enum):
ONE = auto()
TWO = auto(), auto()
THREE = auto(), auto(), auto()
self.assertEqual(Huh.ONE.value, 1)
self.assertEqual(Huh.TWO.value, (2, 3))
self.assertEqual(Huh.THREE.value, (4, 5, 6))
#
class Hah(Enum):
def __new__(cls, value, abbr=None):
member = object.__new__(cls)
member._value_ = value
member.abbr = abbr or value[:3].lower()
return member
def _generate_next_value_(name, start, count, last):
return name
#
MONDAY = auto()
TUESDAY = auto()
WEDNESDAY = auto(), 'WED'
THURSDAY = auto(), 'Thu'
FRIDAY = auto()
self.assertEqual(Hah.MONDAY.value, 'MONDAY')
self.assertEqual(Hah.MONDAY.abbr, 'mon')
self.assertEqual(Hah.TUESDAY.value, 'TUESDAY')
self.assertEqual(Hah.TUESDAY.abbr, 'tue')
self.assertEqual(Hah.WEDNESDAY.value, 'WEDNESDAY')
self.assertEqual(Hah.WEDNESDAY.abbr, 'WED')
self.assertEqual(Hah.THURSDAY.value, 'THURSDAY')
self.assertEqual(Hah.THURSDAY.abbr, 'Thu')
self.assertEqual(Hah.FRIDAY.value, 'FRIDAY')
self.assertEqual(Hah.FRIDAY.abbr, 'fri')
#
class Huh(Enum):
def _generate_next_value_(name, start, count, last):
return count+1
ONE = auto()
TWO = auto(), auto()
THREE = auto(), auto(), auto()
self.assertEqual(Huh.ONE.value, 1)
self.assertEqual(Huh.TWO.value, (2, 2))
self.assertEqual(Huh.THREE.value, (3, 3, 3))
class TestEnumTypeSubclassing(unittest.TestCase):
pass