From b7b95ba1bd7cc8ab4aa4ea3c83bffaaa31ebf50e Mon Sep 17 00:00:00 2001 From: Ethan Furman Date: Wed, 5 Oct 2022 15:25:55 -0700 Subject: [PATCH] gh-96865: [Enum] fix Flag to use CONFORM boundary (GH-97528) (cherry picked from commit b44372e03c5461b6ad3d89763a9eb6cb82df07a4) Co-authored-by: Ethan Furman --- Lib/enum.py | 2 +- Lib/test/test_enum.py | 2 +- .../2022-09-24-18-56-23.gh-issue-96865.o9WUkW.rst | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2022-09-24-18-56-23.gh-issue-96865.o9WUkW.rst diff --git a/Lib/enum.py b/Lib/enum.py index dffb673f44f949..ae97334e220bf0 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 3b1c77d688eca1..d2cfc7f7cd4b91 100644 --- 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 new file mode 100644 index 00000000000000..b054fdeee0785c --- /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 ->