mirror of https://github.com/python/cpython.git
Close #18693: __dir__ removed from Enum; help() now helpful.
This commit is contained in:
parent
a4998a7041
commit
53f58dbd12
|
@ -223,9 +223,6 @@ def __call__(cls, value, names=None, *, module=None, type=None):
|
|||
def __contains__(cls, member):
|
||||
return isinstance(member, cls) and member.name in cls._member_map_
|
||||
|
||||
def __dir__(self):
|
||||
return ['__class__', '__doc__', '__members__'] + self._member_names_
|
||||
|
||||
@property
|
||||
def __members__(cls):
|
||||
"""Returns a mapping of member name->value.
|
||||
|
@ -433,9 +430,6 @@ def __repr__(self):
|
|||
def __str__(self):
|
||||
return "%s.%s" % (self.__class__.__name__, self._name_)
|
||||
|
||||
def __dir__(self):
|
||||
return (['__class__', '__doc__', 'name', 'value'])
|
||||
|
||||
def __eq__(self, other):
|
||||
if type(other) is self.__class__:
|
||||
return self is other
|
||||
|
|
|
@ -78,21 +78,6 @@ def test_enum_value(self):
|
|||
def test_intenum_value(self):
|
||||
self.assertEqual(IntStooges.CURLY.value, 2)
|
||||
|
||||
def test_dir_on_class(self):
|
||||
Season = self.Season
|
||||
self.assertEqual(
|
||||
set(dir(Season)),
|
||||
set(['__class__', '__doc__', '__members__',
|
||||
'SPRING', 'SUMMER', 'AUTUMN', 'WINTER']),
|
||||
)
|
||||
|
||||
def test_dir_on_item(self):
|
||||
Season = self.Season
|
||||
self.assertEqual(
|
||||
set(dir(Season.WINTER)),
|
||||
set(['__class__', '__doc__', 'name', 'value']),
|
||||
)
|
||||
|
||||
def test_enum(self):
|
||||
Season = self.Season
|
||||
lst = list(Season)
|
||||
|
|
Loading…
Reference in New Issue