]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-135559: [Enum] dir() on a Flag now shows aliases (GH-136527)
authorEthan Furman <ethan@stoneleaf.us>
Wed, 10 Dec 2025 19:46:10 +0000 (11:46 -0800)
committerGitHub <noreply@github.com>
Wed, 10 Dec 2025 19:46:10 +0000 (11:46 -0800)
Lib/enum.py
Lib/test/test_enum.py
Misc/NEWS.d/next/Library/2025-07-10-18-40-11.gh-issue-135559.BMDtYn.rst [new file with mode: 0644]

index ad782b8c41e1607616bea8e9a54bc650c746d38d..15dddf6de6926847d009efe05d24ee985c5e9cb2 100644 (file)
@@ -774,12 +774,16 @@ class EnumType(type):
         super().__delattr__(attr)
 
     def __dir__(cls):
+        if issubclass(cls, Flag):
+            members = list(cls._member_map_.keys())
+        else:
+            members = cls._member_names_
         interesting = set([
                 '__class__', '__contains__', '__doc__', '__getitem__',
                 '__iter__', '__len__', '__members__', '__module__',
                 '__name__', '__qualname__',
                 ]
-                + cls._member_names_
+                + members
                 )
         if cls._new_member_ is not object.__new__:
             interesting.add('__new__')
index 66d78980c41cb68d82883a3760125239f1680bfd..779457119e8f0eac6740f806cbb734daeed82a3c 100644 (file)
@@ -5529,12 +5529,16 @@ class TestEnumDict(unittest.TestCase):
 # helpers
 
 def enum_dir(cls):
+    if issubclass(cls, Flag):
+        members = list(cls._member_map_.keys())
+    else:
+        members = cls._member_names_
     interesting = set([
             '__class__', '__contains__', '__doc__', '__getitem__',
             '__iter__', '__len__', '__members__', '__module__',
             '__name__', '__qualname__',
             ]
-            + cls._member_names_
+            + members
             )
     if cls._new_member_ is not object.__new__:
         interesting.add('__new__')
diff --git a/Misc/NEWS.d/next/Library/2025-07-10-18-40-11.gh-issue-135559.BMDtYn.rst b/Misc/NEWS.d/next/Library/2025-07-10-18-40-11.gh-issue-135559.BMDtYn.rst
new file mode 100644 (file)
index 0000000..2ab3d4d
--- /dev/null
@@ -0,0 +1,2 @@
+Flag: a ``dir()`` on a ``Flag`` enumeration now shows non-canonical members.
+(i.e. aliases).