8000 gh-107538: [Enum] fix handling of inverted/negative values by ethanfurman · Pull Request #132273 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-107538: [Enum] fix handling of inverted/negative values #132273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 10, 2025
Merged

gh-107538: [Enum] fix handling of inverted/negative values #132273

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a6beb03
Fix flag mask inversion when unnamed flags exist.
ethanfurman Jul 5, 2023
758de5f
EJECT and KEEP flags (IntEnum is KEEP) use direct value.
ethanfurman Jul 5, 2023
7e60935
correct Flag inversion to only flip flag bits
ethanfurman Apr 8, 2025
6ecb9b4
correct negative assigned values in flags
ethanfurman Apr 8, 2025
ffc1910
add blurb
ethanfurman Apr 8, 2025
51b9a65
Merge branch 'main' into enum-invert
ethanfurman Apr 8, 2025
9d0b20a
Merge branch 'main' into enum-invert
ethanfurman Apr 8, 2025
0a4dd5b
handle values of None or tuples
ethanfurman Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
EJECT and KEEP flags (IntEnum is KEEP) use direct value.
  • Loading branch information
@ethanfurman
ethanfurman committed Jul 5, 2023
commit 758de5f51d97189386af4ebba989cc7592eb7a0a
5 changes: 4 additions & 1 deletion Lib/enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1515,7 +1515,10 @@ def __xor__(self, other):

def __invert__(self):
if self._inverted_ is None:
self._inverted_ = self.__class__(self._singles_mask_ & ~self._value_)
if self._boundary_ in (EJECT, KEEP):
self._inverted_ = self.__class__(~self._value_)
else:
self._inverted_ = self.__class__(self._singles_mask_ & ~self._value_)
return self._inverted_

__rand__ = __and__
Expand Down
46 changes: 32 additions & 14 deletions Lib/test/test_enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,11 +858,18 @@ class OpenAB(self.enum_type):
A, B = OpenAB
AB_MASK = OpenAB.MASK
#
self.assertIs(~A, B)
self.assertIs(~B, A)
self.assertIs(~(A|B), OpenAB(0))
self.assertIs(~AB_MASK, OpenAB(0))
self.assertIs(~OpenAB(0), (A|B))
if OpenAB._boundary_ in (EJECT, KEEP):
self.assertIs(~A, OpenAB(254))
self.assertIs(~B, OpenAB(253))
self.assertIs(~(A|B), OpenAB(252))
self.assertIs(~AB_MASK, OpenAB(0))
self.assertIs(~OpenAB(0), AB_MASK)
else:
self.assertIs(~A, B)
self.assertIs(~B, A)
self.assertIs(~(A|B), OpenAB(0))
self.assertIs(~AB_MASK, OpenAB(0))
self.assertIs(~OpenAB(0), (A|B))
#
class OpenXYZ(self.enum_type):
X = 4
Expand All @@ -872,15 +879,26 @@ class OpenXYZ(self.enum_type):
X, Y, Z = OpenXYZ
XYZ_MASK = OpenXYZ.MASK
#
self.assertIs(~X, Y|Z)
self.assertIs(~Y, X|Z)
self.assertIs(~Z, X|Y)
self.assertIs(~(X|Y), Z)
self.assertIs(~(X|Z), Y)
self.assertIs(~(Y|Z), X)
self.assertIs(~(X|Y|Z), OpenXYZ(0))
self.assertIs(~XYZ_MASK, OpenXYZ(0))
self.assertTrue(~OpenXYZ(0), (X|Y|Z))
if OpenXYZ._boundary_ in (EJECT, KEEP):
self.assertIs(~X, OpenXYZ(27))
self.assertIs(~Y, OpenXYZ(29))
self.assertIs(~Z, OpenXYZ(30))
self.assertIs(~(X|Y), OpenXYZ(25))
self.assertIs(~(X|Z), OpenXYZ(26))
self.assertIs(~(Y|Z), OpenXYZ(28))
self.assertIs(~(X|Y|Z), OpenXYZ(24))
self.assertIs(~XYZ_MASK, OpenXYZ(0))
self.assertTrue(~OpenXYZ(0), XYZ_MASK)
else:
self.assertIs(~X, Y|Z)
self.assertIs(~Y, X|Z)
self.assertIs(~Z, X|Y)
self.assertIs(~(X|Y), Z)
self.assertIs(~(X|Z), Y)
self.assertIs(~(Y|Z), X)
self.assertIs(~(X|Y|Z), OpenXYZ(0))
self.assertIs(~XYZ_MASK, OpenXYZ(0))
self.assertTrue(~OpenXYZ(0), (X|Y|Z))


class TestPlainEnum(_EnumTests, _PlainOutputTests, unittest.TestCase):
Expand Down
0