[3.9] bpo-42727: [Enum] EnumMeta.__prepare__ now accepts **kwds (GH-23917). (GH-23926)

* [3.9] [Enum] EnumMeta.__prepare__ now accepts **kwds (GH-23917).
(cherry picked from commit 6ec0adefad60ec7cdec61c44baecf1dccc1461ab)

diff --git a/Lib/enum.py b/Lib/enum.py
index 88c951f4f12b4692fd9937074d6b0862317f08e2..aa9f4b00dd74d55734b89557bcaf4f0082fbdd68 100644 (file)
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -170,7 +170,7 @@ class EnumMeta(type):
     Metaclass for Enum
     """
     @classmethod
-    def __prepare__(metacls, cls, bases):
+    def __prepare__(metacls, cls, bases, **kwds):
         # check that previous enum members do not exist
         metacls._check_for_existing_members(cls, bases)
         # create the namespace dict

diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index 0868c30347216dad0b610c0d7fc31cf7e3f1470e..f6db73167dc9595368d25078773113faaeacbf56 100644 (file)
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -2065,7 +2065,7 @@ class TestEnum(unittest.TestCase):
         except ValueError:
             pass
 
-    def test_init_subclass(self):
+    def test_init_subclass_calling(self):
         class MyEnum(Enum):
             def __init_subclass__(cls, **kwds):
                 super(MyEnum, cls).__init_subclass__(**kwds)
@@ -2101,6 +2101,16 @@ class TestEnum(unittest.TestCase):
         self.assertFalse(NeverEnum.__dict__.get('_test1', False))
         self.assertFalse(NeverEnum.__dict__.get('_test2', False))
 
+    def test_init_subclass_parameter(self):
+        class multiEnum(Enum):
+            def __init_subclass__(cls, multi):
+                for member in cls:
+                    member._as_parameter_ = multi * member.value
+        class E(multiEnum, multi=3):
+            A = 1
+            B = 2
+        self.assertEqual(E.A._as_parameter_, 3)
+        self.assertEqual(E.B._as_parameter_, 6)
 
 class TestOrder(unittest.TestCase):
 

diff --git a/Misc/NEWS.d/next/Library/2020-12-23-19-43-06.bpo-42727.WH3ODh.rst b/Misc/NEWS.d/next/Library/2020-12-23-19-43-06.bpo-42727.WH3ODh.rst
new file mode 100644 (file)
index 0000000..a986cb9
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-12-23-19-43-06.bpo-42727.WH3ODh.rst
@@ -0,0 +1,2 @@
+`EnumMeta.__prepare__` now accepts `**kwds` to properly support
+`__init_subclass__`