From b41803e3ef65624ce39a4bcf4caff6ff1184699f Mon Sep 17 00:00:00 2001 From: Ethan Furman Date: Thu, 25 Jul 2013 13:50:45 -0700 Subject: Close #18545: now only executes member_type if no _value_ is assigned in __new__. --- Lib/enum.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Lib/enum.py') diff --git a/Lib/enum.py b/Lib/enum.py index 0def138e3e4..33af04262e8 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -152,12 +152,12 @@ class EnumMeta(type): args = (args, ) # wrap it one more time if not use_args: enum_member = __new__(enum_class) - original_value = value + if not hasattr(enum_member, '_value_'): + enum_member._value_ = value else: enum_member = __new__(enum_class, *args) - original_value = member_type(*args) - if not hasattr(enum_member, '_value_'): - enum_member._value_ = original_value + if not hasattr(enum_member, '_value_'): + enum_member._value_ = member_type(*args) value = enum_member._value_ enum_member._member_type_ = member_type enum_member._name_ = member_name -- cgit v1.2.3