[Python-checkins] cpython (merge 3.4 -> default): consistently use _name_ and _value_; patch from Kiss Gyorgy

Wed Sep 17 04:03:09 CEST 2014

http://hg.python.org/cpython/rev/cdd412347827
changeset: 92445:cdd412347827
parent: 92442:74f7fbf548d0
parent: 92444:4135f3929b35
user: Ethan Furman <ethan at stoneleaf.us>
date: Tue Sep 16 19:02:30 2014 -0700
summary:
 consistently use _name_ and _value_; patch from Kiss Gyorgy
files:
 Lib/enum.py | 10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Lib/enum.py b/Lib/enum.py
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -159,7 +159,7 @@
 # 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 @@
 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 @@
 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 @@
 # mix-in branch
 else:
 cls = self._member_type_
- val = self.value
+ val = self._value_
 return cls.__format__(val, format_spec)
 
 def __hash__(self):
-- 
Repository URL: http://hg.python.org/cpython
