From cd45385ffad8910293e5659cfe7ab036e70613b7 Mon Sep 17 00:00:00 2001
From: Ethan Furman <ethan@stoneleaf.us>
Date: Fri, 5 Oct 2018 23:29:36 -0700
Subject: bpo-34909: keep searching mixins until base class is found (GH-9737)
---
Lib/enum.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
(limited to 'Lib/enum.py')
diff --git a/Lib/enum.py b/Lib/enum.py
index 0ccb30d428e..fec1aed9b25 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -486,7 +486,7 @@ class EnumMeta(type):
if base is object:
continue
elif '__new__' in base.__dict__:
- if issubclass(base, Enum) and not hasattr(base, '__new_member__'):
+ if issubclass(base, Enum):
continue
return base
@@ -499,7 +499,6 @@ class EnumMeta(type):
member_type = _find_data_type(bases) or object
if first_enum._member_names_:
raise TypeError("Cannot extend enumerations")
-
return member_type, first_enum
@staticmethod
@@ -545,7 +544,6 @@ class EnumMeta(type):
use_args = False
else:
use_args = True
-
return __new__, save_new, use_args
--
cgit v1.2.3