From 33cbb04986d0dabb9c542edc52bb4ea6106d3a81 Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
 <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 14 Dec 2020 14:43:43 -0800
Subject: [PATCH] bpo-40084: Enum - dir() includes member attributes (GH-19219)

(cherry picked from commit 68526fe258da8c01196fd7cf48e8e5f1280bf8fd)

Co-authored-by: Angelin BOOZ <9497359+lem2clide@users.noreply.github.com>
---
 Lib/enum.py                                          |  2 +-
 Lib/test/test_enum.py                                | 12 ++++++++++++
 Lib/test/test_httplib.py                             |  6 +++++-
 Misc/ACKS                                            |  1 +
 .../Library/2020-03-29-21-32-00.bpo-40084.MCYwcv.rst |  1 +
 5 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2020-03-29-21-32-00.bpo-40084.MCYwcv.rst

diff --git a/Lib/enum.py b/Lib/enum.py
index b14da088f33..35210c99332 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -699,7 +699,7 @@ class Enum(metaclass=EnumMeta):
                 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 ccc2cbe1ec1..dca668a9046 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -215,6 +215,18 @@ class TestEnum(unittest.TestCase):
                 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 ed125893d6d..28943f02564 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
@@ -516,6 +516,10 @@ class TransferEncodingTest(TestCase):
 
 
 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 12a5ac1410a..ebf12c9a9f1 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -192,6 +192,7 @@ Gawain Bolton
 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 00000000000..65ff4ce36e8
--- /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.