Skip to content

gh-102558: [Enum] better handling of non-Enum EnumType classes #103060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 27, 2023
Merged

gh-102558: [Enum] better handling of non-Enum EnumType classes #103060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bef8ac
fix for non-Enum EnumType class
ethanfurman Mar 25, 2023
8739409
fix for non-Enum EnumType classes
ethanfurman Mar 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions Lib/enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@ def _convert_(cls, name, module, filter, source=None, *, boundary=None, as_globa
def _check_for_existing_members_(mcls, class_name, bases):
for chain in bases:
for base in chain.__mro__:
if issubclass(base, Enum) and base._member_names_:
if isinstance(base, EnumType) and base._member_names_:
raise TypeError(
"<enum %r> cannot extend %r"
% (class_name, base)
Expand All @@ -942,7 +942,7 @@ def _get_mixins_(mcls, class_name, bases):
# ensure final parent class is an Enum derivative, find any concrete
# data type, and check that Enum has no members
first_enum = bases[-1]
if not issubclass(first_enum, Enum):
if not isinstance(first_enum, EnumType):
raise TypeError("new enumerations should be created as "
"`EnumName([mixin_type, ...] [data_type,] enum_type)`")
member_type = mcls._find_data_type_(class_name, bases) or object
Expand All @@ -954,7 +954,7 @@ def _find_data_repr_(mcls, class_name, bases):
for base in chain.__mro__:
if base is object:
continue
elif issubclass(base, Enum):
elif isinstance(base, EnumType):
# if we hit an Enum, use it's _value_repr_
return base._value_repr_
elif '__repr__' in base.__dict__:
Expand All @@ -980,12 +980,12 @@ def _find_data_type_(mcls, class_name, bases):
base_chain.add(base)
if base is object:
continue
elif issubclass(base, Enum):
elif isinstance(base, EnumType):
if base._member_type_ is not object:
data_types.add(base._member_type_)
break
elif '__new__' in base.__dict__ or '__init__' in base.__dict__:
if issubclass(base, Enum):
if isinstance(base, EnumType):
continue
data_types.add(candidate or base)
break
Expand Down Expand Up @@ -1186,8 +1186,6 @@ def _missing_(cls, value):
return None

def __repr__(self):
if not isinstance(self, Enum):
return repr(self)
v_repr = self.__class__._value_repr_ or repr
return "<%s.%s: %s>" % (self.__class__.__name__, self._name_, v_repr(self._value_))

Expand Down
1 change: 0 additions & 1 deletion Lib/test/test_enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1369,7 +1369,6 @@ def repr(self):
class Huh(MyStr, MyInt, Enum):
One = 1


def test_pickle_enum(self):
if isinstance(Stooges, Exception):
raise Stooges
Expand Down