Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[3.12] gh-131045: [Enum] fix flag containment checks when using values (GH-131053) #131232

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 3 commits into from
Mar 24, 2025
Merged

[3.12] gh-131045: [Enum] fix flag containment checks when using values (GH-131053) #131232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cee7b5
gh-131045: [Enum] fix flag containment checks when using values (GH-1…
ethanfurman Mar 12, 2025
5602620
remove ref to unknown attributes
picnixz Mar 14, 2025
cff7345
Merge branch '3.12' into bp-312/17d06aeb5476099bc1acd89cd6f69e239e0f9…
ethanfurman Mar 23, 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
7 changes: 6 additions & 1 deletion Lib/enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,10 +771,15 @@ def __contains__(cls, value):
`value` is in `cls` if:
1) `value` is a member of `cls`, or
2) `value` is the value of one of the `cls`'s members.
3) `value` is a pseudo-member (flags)
"""
if isinstance(value, cls):
return True
return value in cls._value2member_map_ or value in cls._unhashable_values_
try:
cls(value)
return True
except ValueError:
return value in cls._unhashable_values_

def __delattr__(cls, attr):
# nicer error message when someone tries to delete an attribute
Expand Down
2 changes: 2 additions & 0 deletions Lib/test/test_enum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ def test_basics(self):
self.assertEqual(str(TE), "<flag 'MainEnum'>")
self.assertEqual(format(TE), "<flag 'MainEnum'>")
self.assertTrue(TE(5) is self.dupe2)
self.assertTrue(7 in TE)
else:
self.assertEqual(repr(TE), "<enum 'MainEnum'>")
self.assertEqual(str(TE), "<enum 'MainEnum'>")
Expand Down Expand Up @@ -4848,6 +4849,7 @@ class Color(enum.Enum)
| `value` is in `cls` if:
| 1) `value` is a member of `cls`, or
| 2) `value` is the value of one of the `cls`'s members.
| 3) `value` is a pseudo-member (flags)
|
| __getitem__(name)
| Return the member matching `name`.
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2025-03-10-12-26-56.gh-issue-131045.s1TssJ.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix issue with ``__contains__``, values, and pseudo-members for :class:`enum.Flag`.
Loading