mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

gh-102558: [Enum] better handling of non-Enum EnumType classes (GH-103060)

Browse source
This commit is contained in:
Ethan Furman 2023-03-27 16:26:16 -07:00 • committed by GitHub
parent b838d80085
commit f4ed2c6ae5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/enum.py
View file

@ -928,7 +928,7 @@ class EnumType(type):
def _check_for_existing_members_(mcls, class_name, bases): def _check_for_existing_members_(mcls, class_name, bases):
for chain in bases: for chain in bases:
for base in chain.__mro__: for base in chain.__mro__:
if issubclass(base, Enum) and base._member_names_: if isinstance(base, EnumType) and base._member_names_:
raise TypeError( raise TypeError(
"<enum %r> cannot extend %r" "<enum %r> cannot extend %r"
% (class_name, base) % (class_name, base)
@ -947,7 +947,7 @@ class EnumType(type):
# ensure final parent class is an Enum derivative, find any concrete # ensure final parent class is an Enum derivative, find any concrete
# data type, and check that Enum has no members # data type, and check that Enum has no members
first_enum = bases[-1] first_enum = bases[-1]
if not issubclass(first_enum, Enum): if not isinstance(first_enum, EnumType):
raise TypeError("new enumerations should be created as " raise TypeError("new enumerations should be created as "
"`EnumName([mixin_type, ...] [data_type,] enum_type)`") "`EnumName([mixin_type, ...] [data_type,] enum_type)`")
member_type = mcls._find_data_type_(class_name, bases) or object member_type = mcls._find_data_type_(class_name, bases) or object
@ -959,7 +959,7 @@ class EnumType(type):
for base in chain.__mro__: for base in chain.__mro__:
if base is object: if base is object:
continue continue
elif issubclass(base, Enum): elif isinstance(base, EnumType):
# if we hit an Enum, use it's _value_repr_ # if we hit an Enum, use it's _value_repr_
return base._value_repr_ return base._value_repr_
elif '__repr__' in base.__dict__: elif '__repr__' in base.__dict__:
@ -985,12 +985,12 @@ class EnumType(type):
base_chain.add(base) base_chain.add(base)
if base is object: if base is object:
continue continue
elif issubclass(base, Enum): elif isinstance(base, EnumType):
if base._member_type_ is not object: if base._member_type_ is not object:
data_types.add(base._member_type_) data_types.add(base._member_type_)
break break
elif '__new__' in base.__dict__ or '__init__' in base.__dict__: elif '__new__' in base.__dict__ or '__init__' in base.__dict__:
if issubclass(base, Enum): if isinstance(base, EnumType):
continue continue
data_types.add(candidate or base) data_types.add(candidate or base)
break break
@ -1191,8 +1191,6 @@ class Enum(metaclass=EnumType):
return None return None
def __repr__(self): def __repr__(self):
if not isinstance(self, Enum):
return repr(self)
v_repr = self.__class__._value_repr_ or repr v_repr = self.__class__._value_repr_ or repr
return "<%s.%s: %s>" % (self.__class__.__name__, self._name_, v_repr(self._value_)) return "<%s.%s: %s>" % (self.__class__.__name__, self._name_, v_repr(self._value_))

1
Lib/test/test_enum.py
View file

@ -1386,7 +1386,6 @@ class TestSpecial(unittest.TestCase):
class Huh(MyStr, MyInt, Enum): class Huh(MyStr, MyInt, Enum):
One = 1 One = 1
def test_pickle_enum(self): def test_pickle_enum(self):
if isinstance(Stooges, Exception): if isinstance(Stooges, Exception):
raise Stooges raise Stooges