diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2022-06-23 06:46:33 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-23 06:46:33 (GMT) |
commit | 321acd4138b65363be1f11e5b04f86c204b27a2f (patch) | |
tree | cef2976fe1849ee9c307b6787ec4e6272fcb803e /Lib/enum.py | |
parent | 00a25f87f37f02cd5c0477c5c642a0a7eb322a04 (diff) | |
download | cpython-321acd4138b65363be1f11e5b04f86c204b27a2f.zip cpython-321acd4138b65363be1f11e5b04f86c204b27a2f.tar.gz cpython-321acd4138b65363be1f11e5b04f86c204b27a2f.tar.bz2 |
gh-91456: [Enum] Deprecate default auto() behavior with mixed value types (GH-91457)
When used with plain Enum, auto() returns the last numeric value assigned, skipping any incompatible member values (such as strings); starting in 3.13 the default auto() for plain Enums will require all the values to be of compatible types, and will return a new value that is 1 higher than any existing value.
Co-authored-by: Ethan Furman <ethan@stoneleaf.us>
(cherry picked from commit fb1e9506c14ef32d5bec126dad6fa769c8c054f6)
Co-authored-by: Oscar R <89599049+oscar-LT@users.noreply.github.com>
Diffstat (limited to 'Lib/enum.py')
-rw-r--r-- | Lib/enum.py | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/Lib/enum.py b/Lib/enum.py index 1dc3a0e..747a5578 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -1218,21 +1218,39 @@ class Enum(metaclass=EnumType): def __init__(self, *args, **kwds): pass - def _generate_next_value_(name, start, count, last_values): + def _generate_next_value_(name, start, count, last_value): """ Generate the next value when not given. name: the name of the member start: the initial start value or None count: the number of existing members - last_value: the last value assigned or None + last_value: the list of values assigned """ - for last_value in reversed(last_values): - try: - return last_value + 1 - except TypeError: - pass - else: + if not last_value: + return start + try: + last = last_value[-1] + last_value.sort() + if last == last_value[-1]: + # no difference between old and new methods + return last + 1 + else: + # trigger old method (with warning) + raise TypeError + except TypeError: + import warnings + warnings.warn( + "In 3.13 the default `auto()`/`_generate_next_value_` will require all values to be sortable and support adding +1\n" + "and the value returned will be the largest value in the enum incremented by 1", + DeprecationWarning, + stacklevel=3, + ) + for v in last_value: + try: + return v + 1 + except TypeError: + pass return start @classmethod |