Compare commits

...

1 Commits

Author SHA1 Message Date
Ethan Furman 630d2e14c5 Revert "[Enum] EnumMeta.__prepare__ now accepts **kwds (#23917)"
This reverts commit 6ec0adefad.
2020-12-24 10:05:17 -08:00
3 changed files with 2 additions and 14 deletions

View File

@ -178,7 +178,7 @@ class EnumMeta(type):
Metaclass for Enum
"""
@classmethod
def __prepare__(metacls, cls, bases, **kwds):
def __prepare__(metacls, cls, bases):
# check that previous enum members do not exist
metacls._check_for_existing_members(cls, bases)
# create the namespace dict

View File

@ -2119,7 +2119,7 @@ class TestEnum(unittest.TestCase):
one = '1'
two = b'2', 'ascii', 9
def test_init_subclass_calling(self):
def test_init_subclass(self):
class MyEnum(Enum):
def __init_subclass__(cls, **kwds):
super(MyEnum, cls).__init_subclass__(**kwds)
@ -2155,16 +2155,6 @@ 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)
@unittest.skipUnless(
sys.version_info[:2] == (3, 9),

View File

@ -1,2 +0,0 @@
`EnumMeta.__prepare__` now accepts `**kwds` to properly support
`__init_subclass__`