Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

consistently use _name_ and _value_; patch from Kiss Gyorgy

This commit is contained in:
Ethan Furman 2014-09-16 17:31:23 -07:00
parent bc2c4c9990
commit 0081f23a08
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/enum.py
View File

@ -159,7 +159,7 @@ class EnumMeta(type):
# If another member with the same value was already defined, the # If another member with the same value was already defined, the
# new member becomes an alias to the existing one. # new member becomes an alias to the existing one.
for name, canonical_member in enum_class._member_map_.items(): 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 enum_member = canonical_member
break break
else: else:
@ -224,7 +224,7 @@ class EnumMeta(type):
return cls._create_(value, names, module=module, qualname=qualname, type=type) return cls._create_(value, names, module=module, qualname=qualname, type=type)
def __contains__(cls, member): 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): def __delattr__(cls, attr):
# nicer error message when someone tries to delete an attribute # nicer error message when someone tries to delete an attribute
@ -452,9 +452,9 @@ class Enum(metaclass=EnumMeta):
except TypeError: except TypeError:
# not there, now do long search -- O(n) behavior # not there, now do long search -- O(n) behavior
for member in cls._member_map_.values(): for member in cls._member_map_.values():
if member.value == value: if member._value_ == value:
return member 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): def __repr__(self):
return "<%s.%s: %r>" % ( return "<%s.%s: %r>" % (
@ -480,7 +480,7 @@ class Enum(metaclass=EnumMeta):
# mix-in branch # mix-in branch
else: else:
cls = self._member_type_ cls = self._member_type_
val = self.value val = self._value_
return cls.__format__(val, format_spec) return cls.__format__(val, format_spec)
def __hash__(self): def __hash__(self):