diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-06-10 15:01:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-10 15:01:03 -0700 |
| commit | 01286017c3345e2b8a0af2bd48f6eb2087693a82 (patch) | |
| tree | dc5d6e87c5fae6a099c7b4082955f7181a030810 /Lib/enum.py | |
| parent | e3bc32fc1ad5537b476b34062b07a040533c913a (diff) | |
| download | cpython-git-01286017c3345e2b8a0af2bd48f6eb2087693a82.tar.gz | |
bpo-44356: [Enum] allow multiple data-type mixins if they are all the same (GH-26649) (GH-26653)
This enables, for example, two base Enums to both inherit from `str`, and then both be mixed into the same final Enum:
class Str1Enum(str, Enum):
GH- some behavior here
class Str2Enum(str, Enum):
GH- some more behavior here
class FinalStrEnum(Str1Enum, Str2Enum):
GH- this now works
(cherry picked from commit 8a4f0850d75747af8c96ca0e7eef1f5c1abfba25)
Co-authored-by: Ethan Furman <ethan@stoneleaf.us>
Co-authored-by: Ethan Furman <ethan@stoneleaf.us>
Diffstat (limited to 'Lib/enum.py')
| -rw-r--r-- | Lib/enum.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/enum.py b/Lib/enum.py index f74cc8c31c..54633d8a7f 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -819,7 +819,7 @@ class EnumType(type): return object, Enum def _find_data_type(bases): - data_types = [] + data_types = set() for chain in bases: candidate = None for base in chain.__mro__: @@ -827,19 +827,19 @@ class EnumType(type): continue elif issubclass(base, Enum): if base._member_type_ is not object: - data_types.append(base._member_type_) + data_types.add(base._member_type_) break elif '__new__' in base.__dict__: if issubclass(base, Enum): continue - data_types.append(candidate or base) + data_types.add(candidate or base) break else: candidate = base if len(data_types) > 1: raise TypeError('%r: too many data types: %r' % (class_name, data_types)) elif data_types: - return data_types[0] + return data_types.pop() else: return None |