diff options
| -rw-r--r-- | Lib/enum.py | 7 | ||||
| -rw-r--r-- | Lib/test/test_enum.py | 12 |
2 files changed, 18 insertions, 1 deletions
diff --git a/Lib/enum.py b/Lib/enum.py index 84fa20e..9b19c1d 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -464,7 +464,12 @@ class Enum(metaclass=EnumMeta): return "%s.%s" % (self.__class__.__name__, self._name_) def __dir__(self): - added_behavior = [m for m in self.__class__.__dict__ if m[0] != '_'] + added_behavior = [ + m + for cls in self.__class__.mro() + for m in cls.__dict__ + if m[0] != '_' + ] return (['__class__', '__doc__', '__module__', 'name', 'value'] + added_behavior) diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index f1f8063..dccaa4f 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -176,6 +176,18 @@ class TestEnum(unittest.TestCase): set(['__class__', '__doc__', '__module__', 'name', 'value', 'wowser']), ) + def test_dir_on_sub_with_behavior_on_super(self): + # see issue22506 + class SuperEnum(Enum): + def invisible(self): + return "did you see me?" + class SubEnum(SuperEnum): + sample = 5 + self.assertEqual( + set(dir(SubEnum.sample)), + set(['__class__', '__doc__', '__module__', 'name', 'value', 'invisible']), + ) + def test_enum_in_enum_out(self): Season = self.Season self.assertIs(Season(Season.WINTER), Season.WINTER) |