diff options
author | Ethan Furman <ethan@stoneleaf.us> | 2013-08-10 20:07:49 (GMT) |
---|---|---|
committer | Ethan Furman <ethan@stoneleaf.us> | 2013-08-10 20:07:49 (GMT) |
commit | 53f58dbd122676c1408b3c95c1630028cc1a0e05 (patch) | |
tree | 4150f5be05ad7ec16ade6fb36c80548089ebae24 | |
parent | a4998a70416c27730e75c0a4225ee2c3552b1618 (diff) | |
download | cpython-53f58dbd122676c1408b3c95c1630028cc1a0e05.zip cpython-53f58dbd122676c1408b3c95c1630028cc1a0e05.tar.gz cpython-53f58dbd122676c1408b3c95c1630028cc1a0e05.tar.bz2 |
Close #18693: __dir__ removed from Enum; help() now helpful.
-rw-r--r-- | Lib/enum.py | 6 | ||||
-rw-r--r-- | Lib/test/test_enum.py | 15 |
2 files changed, 0 insertions, 21 deletions
diff --git a/Lib/enum.py b/Lib/enum.py index 34eb7b8..dc97017 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -223,9 +223,6 @@ class EnumMeta(type): 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 @@ class Enum(metaclass=EnumMeta): 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 diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index b959e97..751fd56 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -78,21 +78,6 @@ class TestEnum(unittest.TestCase): 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) |