mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Change _names to _names_ since the latter is reserved for Enum use.

Browse source 
Before this change only the methods were _single_underscored_; now
the attributes are as well.
This commit is contained in:
Ethan Furman 2013-07-19 19:47:21 -07:00
parent 2aa2732eaf
commit 520ad57916
2 changed files with 42 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Lib/test/test_enum.py
View file

@ -516,7 +516,7 @@ class TestEnum(unittest.TestCase):
def question(self):
print(42)
self.assertIsNot(type(Why.question), Why)
self.assertNotIn(Why.question, Why._member_names)
self.assertNotIn(Why.question, Why._member_names_)
self.assertNotIn(Why.question, Why)
def test_wrong_inheritance_order(self):
@ -777,10 +777,10 @@ class TestEnum(unittest.TestCase):
def __new__(cls):
value = len(cls.__members__) + 1
obj = object.__new__(cls)
obj._value = value
obj._value_ = value
return obj
def __int__(self):
return int(self._value)
return int(self._value_)
self.assertEqual(
list(AutoNumber),
[AutoNumber.first, AutoNumber.second, AutoNumber.third],
@ -794,10 +794,10 @@ class TestEnum(unittest.TestCase):
def __new__(cls):
value = len(cls.__members__) + 1
obj = object.__new__(cls)
obj._value = value
obj._value_ = value
return obj
def __int__(self):
return int(self._value)
return int(self._value_)
class Color(AutoNumber):
red = ()
green = ()
@ -810,7 +810,7 @@ class TestEnum(unittest.TestCase):
def __new__(cls):
value = len(cls.__members__) + 1
obj = int.__new__(cls, value)
obj._value = value
obj._value_ = value
return obj
class Color(AutoNumber):
red = ()
@ -823,19 +823,19 @@ class TestEnum(unittest.TestCase):
class OrderedEnum(Enum):
def __ge__(self, other):
if self.__class__ is other.__class__:
return self._value >= other._value
return self._value_ >= other._value_
return NotImplemented
def __gt__(self, other):
if self.__class__ is other.__class__:
return self._value > other._value
return self._value_ > other._value_
return NotImplemented
def __le__(self, other):
if self.__class__ is other.__class__:
return self._value <= other._value
return self._value_ <= other._value_
return NotImplemented
def __lt__(self, other):
if self.__class__ is other.__class__:
return self._value < other._value
return self._value_ < other._value_
return NotImplemented
class Grade(OrderedEnum):
A = 5
@ -847,6 +847,7 @@ class TestEnum(unittest.TestCase):
self.assertLessEqual(Grade.F, Grade.C)
self.assertLess(Grade.D, Grade.A)
self.assertGreaterEqual(Grade.B, Grade.B)
def test_extending2(self):
class Shade(Enum):
def shade(self):
@ -923,7 +924,7 @@ class TestEnum(unittest.TestCase):
def __new__(cls):
value = [len(cls.__members__) + 1]
obj = object.__new__(cls)
obj._value = value
obj._value_ = value
return obj
class ColorInAList(AutoNumberInAList):
red = ()