[3.10] [Enum] improve test, add andrei kulakov to ACKS (GH-26726).

ethanfurman · ethanfurman · commit c172a4760fc7 · 2021-06-15T14:19:12.000-07:00
(cherry picked from commit cb2014f) Co-authored-by: Ethan Furman <ethan@stoneleaf.us>
diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst
@@ -576,7 +576,7 @@ Data Types
          ...     NEON = 31
          Traceback (most recent call last):
          ...
-         ValueError: invalid Flag 'Color': 'WHITE' is missing a named flag for value 8; 'NEON' is missing named flags for values 8, 16
+         ValueError: invalid Flag 'Color': aliases WHITE and NEON are missing combined values of 0x18 [use `enum.show_flag_values(value)` for details]
 
 .. note::
 
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
@@ -660,12 +660,35 @@ def __repr__(self):
         self.assertEqual(repr(MyEnum.A), '<MyEnum.A: 0x1>')
         #
         class SillyInt(HexInt):
+            __qualname__ = 'SillyInt'
             pass
         class MyOtherEnum(SillyInt, enum.Enum):
+            __qualname__ = 'MyOtherEnum'
             D = 4
             E = 5
             F = 6
         self.assertIs(MyOtherEnum._member_type_, SillyInt)
+        globals()['SillyInt'] = SillyInt
+        globals()['MyOtherEnum'] = MyOtherEnum
+        test_pickle_dump_load(self.assertIs, MyOtherEnum.E)
+        test_pickle_dump_load(self.assertIs, MyOtherEnum)
+        #
+        # This did not work in 3.9, but does now with pickling by name
+        class UnBrokenInt(int):
+            __qualname__ = 'UnBrokenInt'
+            def __new__(cls, value):
+                return int.__new__(cls, value)
+        class MyUnBrokenEnum(UnBrokenInt, Enum):
+            __qualname__ = 'MyUnBrokenEnum'
+            G = 7
+            H = 8
+            I = 9
+        self.assertIs(MyUnBrokenEnum._member_type_, UnBrokenInt)
+        self.assertIs(MyUnBrokenEnum(7), MyUnBrokenEnum.G)
+        globals()['UnBrokenInt'] = UnBrokenInt
+        globals()['MyUnBrokenEnum'] = MyUnBrokenEnum
+        test_pickle_dump_load(self.assertIs, MyUnBrokenEnum.I)
+        test_pickle_dump_load(self.assertIs, MyUnBrokenEnum)
 
     def test_too_many_data_types(self):
         with self.assertRaisesRegex(TypeError, 'too many data types'):
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -970,6 +970,7 @@ Andrew Kuchling
 Jakub Kuczys
 Dave Kuhlman
 Jon Kuhn
+Andrei Kulakov
 Ilya Kulakov
 Upendra Kumar
 Toshio Kuratomi
