diff options
| -rw-r--r-- | Lib/enum.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_enum.py | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Lib/enum.py b/Lib/enum.py index 060b2a0dadf..21a94caaee3 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -105,9 +105,9 @@ class _EnumDict(dict): # 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[:]) + self._auto_called = True value = value.value self._member_names.append(key) self._last_values.append(value) diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index 5d72d82cec2..ebf76047972 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -1837,6 +1837,17 @@ class TestEnum(unittest.TestCase): def _generate_next_value_(name, start, count, last): return name + def test_auto_order_wierd(self): + weird_auto = auto() + weird_auto.value = 'pathological case' + class Color(Enum): + red = weird_auto + def _generate_next_value_(name, start, count, last): + return name + blue = auto() + self.assertEqual(list(Color), [Color.red, Color.blue]) + self.assertEqual(Color.red.value, 'pathological case') + self.assertEqual(Color.blue.value, 'blue') def test_duplicate_auto(self): class Dupes(Enum): |