From 0f99324f61d5a2edd8729be5eed6f172c892af24 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Tue, 15 Jun 2021 14:07:37 -0700 Subject: bpo-44342: [Enum] fix data type search (GH-26667) In an inheritance chain of int -> my_int -> final_int the data type is now final_int (not my_int) (cherry picked from commit 3a7cccfd6cd3693e1a2ab65ee05d7f45f8501dfa) Co-authored-by: Ethan Furman Co-authored-by: Ethan Furman --- Lib/enum.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Lib/enum.py') diff --git a/Lib/enum.py b/Lib/enum.py index 9f9c89e8a4..49c46ea86d 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -823,7 +823,7 @@ class EnumType(type): data_types.add(candidate or base) break else: - candidate = base + candidate = candidate or base if len(data_types) > 1: raise TypeError('%r: too many data types: %r' % (class_name, data_types)) elif data_types: -- cgit v1.2.1