From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 5 Oct 2022 23:32:16 +0000 (-0700)
Subject: gh-96865: [Enum] fix Flag to use CONFORM boundary (GH-97528)
X-Git-Tag: v3.11.0~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a788914ca6ad984f676701e01e970ec62472f9e;p=thirdparty%2FPython%2Fcpython.git

gh-96865: [Enum] fix Flag to use CONFORM boundary (GH-97528)

(cherry picked from commit b44372e03c5461b6ad3d89763a9eb6cb82df07a4)

Co-authored-by: Ethan Furman <ethan@stoneleaf.us>
---

diff --git a/Lib/enum.py b/Lib/enum.py
index 28b638c28f17..ff8f5cc45317 100644
--- 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
index 7964d3e474cd..8cd1fe1c106c 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -2878,7 +2878,7 @@ class OldTestFlag(unittest.TestCase):
             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
new file mode 100644
index 000000000000..b054fdeee078
--- /dev/null
+++ 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>