mirror of
https://github.com/python/cpython.git
synced 2025-08-01 23:53:15 +00:00
[3.9] bpo-42851: [Enum] remove brittle __init_subclass__ support (GH-24154) (GH-24155)
Solution to support calls to `__init_subclass__` with members defined is too brittle and breaks with certain mixins..
(cherry picked from commit a581a868d9
)
This commit is contained in:
parent
8c3914aef4
commit
9ab4dd4522
3 changed files with 2 additions and 76 deletions
31
Lib/enum.py
31
Lib/enum.py
|
@ -9,14 +9,6 @@ __all__ = [
|
|||
]
|
||||
|
||||
|
||||
class _NoInitSubclass:
|
||||
"""
|
||||
temporary base class to suppress calling __init_subclass__
|
||||
"""
|
||||
@classmethod
|
||||
def __init_subclass__(cls, **kwds):
|
||||
pass
|
||||
|
||||
def _is_descriptor(obj):
|
||||
"""
|
||||
Returns True if obj is a descriptor, False otherwise.
|
||||
|
@ -219,22 +211,7 @@ class EnumMeta(type):
|
|||
if '__doc__' not in classdict:
|
||||
classdict['__doc__'] = 'An enumeration.'
|
||||
|
||||
# postpone calling __init_subclass__
|
||||
if '__init_subclass__' in classdict and classdict['__init_subclass__'] is None:
|
||||
raise TypeError('%s.__init_subclass__ cannot be None')
|
||||
# remove current __init_subclass__ so previous one can be found with getattr
|
||||
new_init_subclass = classdict.pop('__init_subclass__', None)
|
||||
# create our new Enum type
|
||||
if bases:
|
||||
bases = (_NoInitSubclass, ) + bases
|
||||
enum_class = super().__new__(metacls, cls, bases, classdict, **kwds)
|
||||
enum_class.__bases__ = enum_class.__bases__[1:] #or (object, )
|
||||
else:
|
||||
enum_class = super().__new__(metacls, cls, bases, classdict, **kwds)
|
||||
old_init_subclass = getattr(enum_class, '__init_subclass__', None)
|
||||
# and restore the new one (if there was one)
|
||||
if new_init_subclass is not None:
|
||||
enum_class.__init_subclass__ = classmethod(new_init_subclass)
|
||||
enum_class = super().__new__(metacls, cls, bases, classdict, **kwds)
|
||||
enum_class._member_names_ = [] # names in definition order
|
||||
enum_class._member_map_ = {} # name->value map
|
||||
enum_class._member_type_ = member_type
|
||||
|
@ -346,9 +323,6 @@ class EnumMeta(type):
|
|||
if _order_ != enum_class._member_names_:
|
||||
raise TypeError('member order does not match _order_')
|
||||
|
||||
# finally, call parents' __init_subclass__
|
||||
if Enum is not None and old_init_subclass is not None:
|
||||
old_init_subclass(**kwds)
|
||||
return enum_class
|
||||
|
||||
def __bool__(self):
|
||||
|
@ -726,9 +700,6 @@ class Enum(metaclass=EnumMeta):
|
|||
else:
|
||||
return start
|
||||
|
||||
def __init_subclass__(cls, **kwds):
|
||||
super().__init_subclass__(**kwds)
|
||||
|
||||
@classmethod
|
||||
def _missing_(cls, value):
|
||||
return None
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue