bpo-40084: [Enum] dir() includes member attributes (GH-19219) (GH-22853)
(cherry picked from commit 68526fe258
)
Co-authored-by: Angelin BOOZ <9497359+lem2clide@users.noreply.github.com>
This commit is contained in:
parent
21ca80eef4
commit
f6d1520219
|
@ -705,7 +705,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):
|
||||
|
|
|
@ -214,6 +214,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)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import errno
|
||||
from http import client
|
||||
from http import client, HTTPStatus
|
||||
import io
|
||||
import itertools
|
||||
import os
|
||||
|
@ -515,6 +515,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
|
||||
|
||||
|
|
|
@ -187,6 +187,7 @@ Gawain Bolton
|
|||
Carl Friedrich Bolz-Tereick
|
||||
Forest Bond
|
||||
Gregory Bond
|
||||
Angelin Booz
|
||||
Médéric Boquien
|
||||
Matias Bordese
|
||||
Jonas Borgström
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Fix ``Enum.__dir__``: dir(Enum.member) now includes attributes as well as methods.
|
Loading…
Reference in New Issue