[3.12] pythongh-104271: Fix auto() fallback in case of mixed type Enum (pythonGH-104279)

itamaro · web-flow · commit f4e2049f14d4 · 2023-05-23T11:11:35.000-07:00
pythongh-104271: Fix auto() fallback in case of mixed type Enum
diff --git a/Lib/enum.py b/Lib/enum.py
@@ -1185,7 +1185,7 @@ def _generate_next_value_(name, start, count, last_values):
                     DeprecationWarning,
                     stacklevel=3,
                     )
-            for v in last_values:
+            for v in reversed(last_values):
                 try:
                     return v + 1
                 except TypeError:
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
@@ -4254,11 +4254,14 @@ class Color(Enum):
                 red = 'red'
                 blue = 2
                 green = auto()
+                yellow = auto()
 
-        self.assertEqual(list(Color), [Color.red, Color.blue, Color.green])
+        self.assertEqual(list(Color),
+                         [Color.red, Color.blue, Color.green, Color.yellow])
         self.assertEqual(Color.red.value, 'red')
         self.assertEqual(Color.blue.value, 2)
         self.assertEqual(Color.green.value, 3)
+        self.assertEqual(Color.yellow.value, 4)
 
     @unittest.skipIf(
             python_version < (3, 13),

Original file line number	Diff line number	Diff line change
`@@ -1185,7 +1185,7 @@ def _generate_next_value_(name, start, count, last_values):`
`1185`	`1185`	`DeprecationWarning,`
`1186`	`1186`	`stacklevel=3,`
`1187`	`1187`	`)`
`1188`		`- for v in last_values:`
	`1188`	`+ for v in reversed(last_values):`
`1189`	`1189`	`try:`
`1190`	`1190`	`return v + 1`
`1191`	`1191`	`except TypeError:`