Close #18693: __dir__ removed from Enum; help() now helpful.

diff --git a/Lib/enum.py b/Lib/enum.py
index 34eb7b87f65e6040f8b0517de5b6b580dea7cc3f..dc9701750c678a82843648f42de92ca56abb84f7 100644 (file)
--- 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 b959e9712fdc0e568bdc93c3f5a95f63c7850d82..751fd56fd7fa576270b3f8057073310187d7a96d 100644 (file)
--- 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)