From 6cee7b55bf3dc5351039bbcba10dfc4573668ec7 Mon Sep 17 00:00:00 2001 From: Ethan Furman Date: Wed, 12 Mar 2025 12:10:47 -0700 Subject: [PATCH 1/2] 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. Co-authored-by: Tomas R. --- Lib/enum.py | 10 +++++++++- Lib/test/test_enum.py | 2 ++ .../2025-03-10-12-26-56.gh-issue-131045.s1TssJ.rst | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) 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 eaa517e2fbc39b..902a90f41880a6 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -771,10 +771,18 @@ 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_ # both structures are lists + or value in cls._hashable_values_ + ) def __delattr__(cls, attr): # nicer error message when someone tries to delete an attribute diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index 2e50ae0fe96586..a606002ffe958b 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -422,6 +422,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), "") @@ -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`. 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`. From 56026202f46af6855ef4bd9fe0fed695aa8ac40e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?= <10796600+picnixz@users.noreply.github.com> Date: Fri, 14 Mar 2025 11:41:19 +0100 Subject: [PATCH 2/2] remove ref to unknown attributes --- Lib/enum.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Lib/enum.py b/Lib/enum.py index 902a90f41880a6..c87aeef715761a 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -779,10 +779,7 @@ def __contains__(cls, value): cls(value) return True except ValueError: - return ( - value in cls._unhashable_values_ # both structures are lists - or value in cls._hashable_values_ - ) + return value in cls._unhashable_values_ def __delattr__(cls, attr): # nicer error message when someone tries to delete an attribute