Skip to content

gh-91456: Fix issue affecting the use of auto() alongside aliases in Enums #91457

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

Merged
ethanfurman merged 7 commits into from
Jun 23, 2022
Merged

gh-91456: Fix issue affecting the use of auto() alongside aliases in Enums #91457

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e8480c
Fix issue affecting the use of auto() alongside aliases in Enums
oscar-LT Apr 11, 2022
61ac223
Improve Fix and add test case as requested
oscar-LT Apr 11, 2022
eec3993
Check Incrementable instead of type checking
oscar-LT Apr 14, 2022
606e29a
Update function doc_string for last_values arg
oscar-LT Apr 14, 2022
c3e91e8
Improve time complexity by using filter()
oscar-LT Apr 18, 2022
8769a2e
Forgot to specify exception type (TypeError)
oscar-LT Apr 18, 2022
d65aaf4
deprecate current behavior
ethanfurman Jun 23, 2022
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
Prev Previous commit
Next Next commit
Improve Fix and add test case as requested
  • Loading branch information
@oscar-LT @ethanfurman
oscar-LT authored and ethanfurman committed Jun 22, 2022
commit 61ac2237263ce7141fc6c8bfe656aa8723bd19ba
3 changes: 2 additions & 1 deletion Lib/enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,7 +1214,8 @@ def _generate_next_value_(name, start, count, last_values):
count: the number of existing members
last_value: the last value assigned or None
"""
for last_value in sorted(last_values, reverse=True):
numerical_last_values = [x for x in last_values if isinstance(x, int) or isinstance(x, float)]
for last_value in sorted(numerical_last_values, reverse=True):
try:
return last_value + 1
except TypeError:
Expand Down
12 changes: 12 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 @@ -3991,6 +3991,18 @@ def _generate_next_value_(name, start, count, last):
self.assertEqual(Color.red.value, 'pathological case')
self.assertEqual(Color.blue.value, 'blue')

def test_auto_with_aliases(self):
class Color(Enum):
red = auto()
blue = auto()
oxford = blue
crimson = red
green = auto()
self.assertIs(Color.crimson, Color.red)
self.assertIs(Color.oxford, Color.blue)
self.assertIsNot(Color.green, Color.red)
self.assertIsNot(Color.green, Color.blue)

def test_duplicate_auto(self):
class Dupes(Enum):
first = primero = auto()
Expand Down