8000 [3.7] bpo-40025: Require _generate_next_value_ to be defined before members (GH-19098) by miss-islington · Pull Request #19762 · python/cpython · GitHub
[go: up one dir, main page]

Skip to content

[3.7] bpo-40025: Require _generate_next_value_ to be defined before members (GH-19098) #19762

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 1 commit into from
Jun 11, 2020
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: 4 additions & 0 deletions Doc/library/enum.rst
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,10 @@ overridden::
the next :class:`int` in sequence with the last :class:`int` provided, but
the way it does this is an implementation detail and may change.

.. note::

The :meth:`_generate_next_value_` method must be defined before any members.

Iteration
---------

Expand Down
5 changes: 5 additions & 0 deletions Lib/enum.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ def __init__(self):
self._member_names = []
self._last_values = []
self._ignore = []
self._auto_called = False

def __setitem__(self, key, value):
"""Changes anything not dundered or not a descriptor.
Expand All @@ -83,6 +84,9 @@ def __setitem__(self, key, value):
):
raise ValueError('_names_ are reserved for future Enum use')
if key == '_generate_next_value_':
# check if members already defined as auto()
if self._auto_called:
raise TypeError("_generate_next_value_ must be defined before members")
setattr(self, '_generate_next_value', value)
elif key == '_ignore_':
if isinstance(value, str):
Expand All @@ -106,6 +110,7 @@ def __setitem__(self, key, value):
# enum overwriting a descriptor?
raise TypeError('%r already defined as: %r' % (key, self[key]))
if isinstance(value, auto):
self._auto_called = True
if value.value == _auto_null:
value.value = self._generate_next_value(key, 1, len(self._member_names), self._last_values[:])
value = value.value
Expand Down
10 changes: 10 additions & 0 deletions Lib/test/test_enum.py
Original file line number Diff line number Diff line change
Expand Up @@ -1710,6 +1710,16 @@ class Color(Enum):
self.assertEqual(Color.blue.value, 2)
self.assertEqual(Color.green.value, 3)

def test_auto_order(self):
with self.assertRaises(TypeError):
class Color(Enum):
red = auto()
green = auto()
blue = auto()
def _generate_next_value_(name, start, count, last):
return name


def test_duplicate_auto(self):
class Dupes(Enum):
first = primero = auto()
Expand Down
1 change: 1 addition & 0 deletions Misc/ACKS
Original file line number Diff line number Diff line change
Expand Up @@ -1184,6 +1184,7 @@ Adam Olsen
Bryan Olson
Grant Olson
Koray Oner
Ethan Onstott
Piet van Oostrum
Tomas Oppelstrup
Jason Orendorff
Expand Down