bpo-40084: Enum - dir() includes member attributes (GH-19219)
diff --git a/Lib/enum.py b/Lib/enum.py
index 3c459ea..e8603a4 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -644,7 +644,7 @@
for cls in self.__class__.mro()
for m in cls.__dict__
if m[0] != '_' and m not in self._member_map_
- ]
+ ] + [m for m in self.__dict__ if m[0] != '_']
return (['__class__', '__doc__', '__module__'] + added_behavior)
def __format__(self, format_spec):
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index 59789fb..3f39073 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -216,6 +216,18 @@
set(['__class__', '__doc__', '__module__', 'name', 'value', 'invisible']),
)
+ def test_dir_on_sub_with_behavior_including_instance_dict_on_super(self):
+ # see issue40084
+ class SuperEnum(IntEnum):
+ def __new__(cls, value, description=""):
+ obj = int.__new__(cls, value)
+ obj._value_ = value
+ obj.description = description
+ return obj
+ class SubEnum(SuperEnum):
+ sample = 5
+ self.assertTrue({'description'} <= set(dir(SubEnum.sample)))
+
def test_enum_in_enum_out(self):
Season = self.Season
self.assertIs(Season(Season.WINTER), Season.WINTER)
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index a3f268b..4abff60 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -1,5 +1,5 @@
import errno
-from http import client
+from http import client, HTTPStatus
import io
import itertools
import os
@@ -519,6 +519,10 @@
class BasicTest(TestCase):
+ def test_dir_with_added_behavior_on_status(self):
+ # see issue40084
+ self.assertTrue({'description', 'name', 'phrase', 'value'} <= set(dir(HTTPStatus(404))))
+
def test_status_lines(self):
# Test HTTP status lines
diff --git a/Misc/ACKS b/Misc/ACKS
index d23797a..01ee1cb 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -191,6 +191,7 @@
Carl Friedrich Bolz-Tereick
Forest Bond
Gregory Bond
+Angelin Booz
Médéric Boquien
Matias Bordese
Jonas Borgström
diff --git a/Misc/NEWS.d/next/Library/2020-03-29-21-32-00.bpo-40084.MCYwcv.rst b/Misc/NEWS.d/next/Library/2020-03-29-21-32-00.bpo-40084.MCYwcv.rst
new file mode 100644
index 0000000..65ff4ce
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-03-29-21-32-00.bpo-40084.MCYwcv.rst
@@ -0,0 +1 @@
+Fix ``Enum.__dir__``: dir(Enum.member) now includes attributes as well as methods.