From e42b35c6346d6338333848b4ac27ed5a57746ac0 Mon Sep 17 00:00:00 2001 From: Ethan Furman Date: Wed, 12 Mar 2025 12:10:47 -0700 Subject: [PATCH] gh-131045: [Enum] fix flag containment checks when using values (GH-131053) Check would fail if value would create a pseudo-member, but that member had not yet been created. We now attempt to create a pseudo-member for a passed-in value first. (cherry picked from commit 17d06aeb5476099bc1acd89cd6f69e239e0f9350) Co-authored-by: Ethan Furman Co-authored-by: Tomas R. --- Lib/enum.py | 6 ++++-- Lib/test/test_enum.py | 2 ++ .../Library/2025-03-10-12-26-56.gh-issue-131045.s1TssJ.rst | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2025-03-10-12-26-56.gh-issue-131045.s1TssJ.rst diff --git a/Lib/enum.py b/Lib/enum.py index 37f16976bbacde..9cab804115e484 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -746,12 +746,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 11e95d5b88b8c9..a2eb81c1da5589 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -463,6 +463,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), "") @@ -4968,6 +4969,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`.