Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-42727: [Enum] use super() and include **kwds (GH-23927) 

for multiple inheritance support:

use super().new
pass **kwds to super().new
This commit is contained in:
Ethan Furman 2020-12-24 19:31:10 -08:00 committed by GitHub
parent c6c43b2874
commit 786d97a66c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/enum.py
View File

@ -235,10 +235,10 @@ class EnumMeta(type):
# create our new Enum type # create our new Enum type
if bases: if bases:
bases = (_NoInitSubclass, ) + bases bases = (_NoInitSubclass, ) + bases
enum_class = type.__new__(metacls, cls, bases, classdict) enum_class = super().__new__(metacls, cls, bases, classdict, **kwds)
enum_class.__bases__ = enum_class.__bases__[1:] #or (object, ) enum_class.__bases__ = enum_class.__bases__[1:] #or (object, )
else: else:
enum_class = type.__new__(metacls, cls, bases, classdict) enum_class = super().__new__(metacls, cls, bases, classdict, **kwds)
old_init_subclass = getattr(enum_class, '__init_subclass__', None) old_init_subclass = getattr(enum_class, '__init_subclass__', None)
# and restore the new one (if there was one) # and restore the new one (if there was one)
if new_init_subclass is not None: if new_init_subclass is not None: