pythongh-96865: [Enum] fix Flag to use CONFORM boundary (pythonGH-97528)

(cherry picked from commit b44372e) Co-authored-by: Ethan Furman <[email protected]>
miss-islington · Oct 5, 2022 · b7b95ba · b7b95ba
1 parent eecbeec
commit b7b95ba
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/Lib/enum.py b/Lib/enum.py
@@ -1292,7 +1292,7 @@ class FlagBoundary(StrEnum):
 STRICT, CONFORM, EJECT, KEEP = FlagBoundary
 
 
-class Flag(Enum, boundary=STRICT):
+class Flag(Enum, boundary=CONFORM):
     """
     Support for flags
     """

diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
@@ -2878,7 +2878,7 @@ def test_bool(self):
             self.assertEqual(bool(f.value), bool(f))
 
     def test_boundary(self):
-        self.assertIs(enum.Flag._boundary_, STRICT)
+        self.assertIs(enum.Flag._boundary_, CONFORM)
         class Iron(Flag, boundary=STRICT):
             ONE = 1
             TWO = 2

diff --git a/Misc/NEWS.d/next/Library/2022-09-24-18-56-23.gh-issue-96865.o9WUkW.rst b/Misc/NEWS.d/next/Library/2022-09-24-18-56-23.gh-issue-96865.o9WUkW.rst
@@ -0,0 +1,9 @@
+fix Flag to use boundary CONFORM
+
+This restores previous Flag behavior of allowing flags with non-sequential values to be combined; e.g.
+
+    class Skip(Flag):
+        TWO = 2
+        EIGHT = 8
+
+    Skip.TWO | Skip.EIGHT -> <Skip.TWO|EIGHT: 10>