summaryrefslogtreecommitdiffstats
path: root/Lib/enum.py
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2021-06-10 22:03:29 (GMT)
committerGitHub <noreply@github.com>2021-06-10 22:03:29 (GMT)
commit304ec53b53021ceddf62a38e66a06aed37e2ac41 (patch)
tree894178ac2292e47d930d55708ba7802742e3bce2 /Lib/enum.py
parent175ebc60d52f2e88cf5cba5224c15074d2623c10 (diff)
downloadcpython-304ec53b53021ceddf62a38e66a06aed37e2ac41.zip
cpython-304ec53b53021ceddf62a38e66a06aed37e2ac41.tar.gz
cpython-304ec53b53021ceddf62a38e66a06aed37e2ac41.tar.bz2
bpo-44356: [Enum] allow multiple data-type mixins if they are all the same (GH-26649) (GH-26652)
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.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/enum.py b/Lib/enum.py
index be74796..f09cb84 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -556,7 +556,7 @@ class EnumMeta(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__:
@@ -564,19 +564,19 @@ class EnumMeta(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