diff --git a/Lib/enum.py b/Lib/enum.py index 04443471b40bff..ee963d6a7e67d1 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -739,12 +739,14 @@ 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 try: - return value in cls._value2member_map_ - except TypeError: + cls(value) + return True + except ValueError: return ( value in cls._unhashable_values_ # both structures are lists or value in cls._hashable_values_ diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index 8884295b1ab89c..1a0026987cd7eb 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -462,6 +462,7 @@ def test_basics(self): self.assertEqual(str(TE), "") self.assertEqual(format(TE), "") self.assertTrue(TE(5) is self.dupe2) + self.assertTrue(7 in TE) else: self.assertEqual(repr(TE), "") self.assertEqual(str(TE), "") @@ -4954,6 +4955,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`. diff --git a/Misc/NEWS.d/next/Library/2025-03-10-12-26-56.gh-issue-131045.s1TssJ.rst b/Misc/NEWS.d/next/Library/2025-03-10-12-26-56.gh-issue-131045.s1TssJ.rst new file mode 100644 index 00000000000000..b6aa07276bb546 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2025-03-10-12-26-56.gh-issue-131045.s1TssJ.rst @@ -0,0 +1 @@ +Fix issue with ``__contains__``, values, and pseudo-members for :class:`enum.Flag`.