From 0081f23a08b6f661a57a62c9ab8ce38bf90e8ed7 Mon Sep 17 00:00:00 2001 From: Ethan Furman Date: Tue, 16 Sep 2014 17:31:23 -0700 Subject: consistently use _name_ and _value_; patch from Kiss Gyorgy --- Lib/enum.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib/enum.py b/Lib/enum.py index 844a956..84fa20e 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -159,7 +159,7 @@ class EnumMeta(type): # If another member with the same value was already defined, the # new member becomes an alias to the existing one. for name, canonical_member in enum_class._member_map_.items(): - if canonical_member.value == enum_member._value_: + if canonical_member._value_ == enum_member._value_: enum_member = canonical_member break else: @@ -224,7 +224,7 @@ class EnumMeta(type): return cls._create_(value, names, module=module, qualname=qualname, type=type) def __contains__(cls, member): - return isinstance(member, cls) and member.name in cls._member_map_ + return isinstance(member, cls) and member._name_ in cls._member_map_ def __delattr__(cls, attr): # nicer error message when someone tries to delete an attribute @@ -452,9 +452,9 @@ class Enum(metaclass=EnumMeta): except TypeError: # not there, now do long search -- O(n) behavior for member in cls._member_map_.values(): - if member.value == value: + if member._value_ == value: return member - raise ValueError("%s is not a valid %s" % (value, cls.__name__)) + raise ValueError("%r is not a valid %s" % (value, cls.__name__)) def __repr__(self): return "<%s.%s: %r>" % ( @@ -480,7 +480,7 @@ class Enum(metaclass=EnumMeta): # mix-in branch else: cls = self._member_type_ - val = self.value + val = self._value_ return cls.__format__(val, format_spec) def __hash__(self): -- cgit v0.12