summaryrefslogtreecommitdiff
path: root/Lib/enum.py
diff options
context:
space:
mode:
authorEthan Furman <ethan@stoneleaf.us>2020-09-15 15:56:26 -0700
committerGitHub <noreply@github.com>2020-09-15 15:56:26 -0700
commitbff01f3a3aac0c15fe8fbe8b2f561f7927d117a1 (patch)
tree0b925d7fd3d5fcfd5569e26220e6def180c80a33 /Lib/enum.py
parent2e87774df1a0eaf2a1fe8cc4d958df60f7125b6e (diff)
downloadcpython-git-bff01f3a3aac0c15fe8fbe8b2f561f7927d117a1.tar.gz
bpo-39587: Enum - use correct mixed-in data type (GH-22263)
Diffstat (limited to 'Lib/enum.py')
-rw-r--r--Lib/enum.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/Lib/enum.py b/Lib/enum.py
index bc24f2ae2d..5e0088ee89 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -482,14 +482,25 @@ class EnumMeta(type):
return object, Enum
def _find_data_type(bases):
+ data_types = []
for chain in bases:
+ candidate = None
for base in chain.__mro__:
if base is object:
continue
elif '__new__' in base.__dict__:
if issubclass(base, Enum):
continue
- return base
+ data_types.append(candidate or base)
+ break
+ elif not issubclass(base, Enum):
+ candidate = base
+ if len(data_types) > 1:
+ raise TypeError('too many data types: %r' % data_types)
+ elif data_types:
+ return data_types[0]
+ else:
+ return None
# ensure final parent class is an Enum derivative, find any concrete
# data type, and check that Enum has no members