diff options
Diffstat (limited to 'Lib/enum.py')
| -rw-r--r-- | Lib/enum.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Lib/enum.py b/Lib/enum.py index 16033b1..dfde750 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -487,14 +487,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 |