From: Ethan Furman <ethan@stoneleaf.us>
Date: Wed, 16 Jun 2021 01:50:59 +0000 (-0700)
Subject: [3.10] bpo-44342: [Enum] improve test, add andrei kulakov to ACKS (GH-26726)
X-Git-Tag: v3.10.0b3~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41c2a4a727d3d559632598759433e0ec1bf594f5;p=thirdparty%2FPython%2Fcpython.git

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

* [3.10] [Enum] improve test, add andrei kulakov to ACKS (GH-26726).
(cherry picked from commit cb2014f2077c92c35486bf0db7e646a68478a7a5)

Co-authored-by: Ethan Furman <ethan@stoneleaf.us>
---

diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst
index 2d19ef6f2565..077a35453ae4 100644
--- 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/enum.py b/Lib/enum.py
index 49c46ea86dba..90777988dd04 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -1637,7 +1637,7 @@ class verify:
                     else:
                         value = 'combined values of 0x%x' % missing_value
                     raise ValueError(
-                            'invalid Flag %r: %s %s [use `enum.show_flag_values(value)` for details]'
+                            'invalid Flag %r: %s %s [use enum.show_flag_values(value) for details]'
                             % (cls_name, alias, value)
                             )
         return enumeration
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index 956b8347b1e1..c4c458e6bfc4 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -660,12 +660,35 @@ class TestEnum(unittest.TestCase):
         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'):
@@ -3591,7 +3614,7 @@ class TestVerify(unittest.TestCase):
         self.assertEqual(Bizarre.d.value, 6)
         with self.assertRaisesRegex(
                 ValueError,
-                "invalid Flag 'Bizarre': aliases b and d are missing combined values of 0x3 .use `enum.show_flag_values.value.` for details.",
+                "invalid Flag 'Bizarre': aliases b and d are missing combined values of 0x3 .use enum.show_flag_values.value. for details.",
             ):
             @verify(NAMED_FLAGS)
             class Bizarre(Flag):
@@ -3610,7 +3633,7 @@ class TestVerify(unittest.TestCase):
         self.assertEqual(Bizarre.d.value, 6)
         with self.assertRaisesRegex(
                 ValueError,
-                "invalid Flag 'Bizarre': alias d is missing value 0x2 .use `enum.show_flag_values.value.` for details.",
+                "invalid Flag 'Bizarre': alias d is missing value 0x2 .use enum.show_flag_values.value. for details.",
             ):
             @verify(NAMED_FLAGS)
             class Bizarre(IntFlag):
diff --git a/Misc/ACKS b/Misc/ACKS
index 0cb738b3a12e..b1bd33aaa35c 100644
--- 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