diff Lib/enum.py @ 85127:39697dcd97e3

Issue 18693: Put custom __dir__ back in place. Will instead look at fixing `help()`.
author Ethan Furman <ethan@stoneleaf.us>
date Mon, 12 Aug 2013 06:51:41 -0700
parents 5d417257748e
children a9ee869cae40
line wrap: on
line diff
--- a/Lib/enum.py	Sun Aug 11 16:48:44 2013 -0700
+++ b/Lib/enum.py	Mon Aug 12 06:51:41 2013 -0700
@@ -223,6 +223,9 @@
     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.
@@ -430,6 +433,9 @@
     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