From 59a319fd9ff6801875d1c305fad4659f492905fb Mon Sep 17 00:00:00 2001 From: Ethan Furman Date: Mon, 10 Mar 2025 12:27:04 -0700 Subject: [PATCH 1/3] [Enum] fix flag containment checks when using values 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. --- 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 04443471b40bff..164e93c893b745 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 psuedo-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..8e0a13afd7926d 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 psuedo-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..f2730f72c7bc8f --- /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 Flags. From 6cce5d69c3beb38afe98439b87119a6bdf66a1a0 Mon Sep 17 00:00:00 2001 From: Ethan Furman Date: Tue, 11 Mar 2025 13:26:01 -0700 Subject: [PATCH 2/3] Apply suggestions from code review spelling and mark-up fixes Co-authored-by: Tomas R. --- Lib/enum.py | 2 +- Lib/test/test_enum.py | 2 +- .../next/Library/2025-03-10-12-26-56.gh-issue-131045.s1TssJ.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/enum.py b/Lib/enum.py index 164e93c893b745..ee963d6a7e67d1 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -739,7 +739,7 @@ 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 psuedo-member (flags) + 3) `value` is a pseudo-member (flags) """ if isinstance(value, cls): return True diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index 8e0a13afd7926d..1a0026987cd7eb 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -4955,7 +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 psuedo-member (flags) + | 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 index f2730f72c7bc8f..b6aa07276bb546 100644 --- 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 @@ -1 +1 @@ -Fix issue with ``__contains__``, values, and pseudo-members for Flags. +Fix issue with ``__contains__``, values, and pseudo-members for :class:`enum.Flag`. From 49b0e1cf2ce3df541d9ec305f046455dd6d13abb Mon Sep 17 00:00:00 2001 From: Ethan Furman Date: Wed, 12 Mar 2025 10:23:32 -0700 Subject: [PATCH 3/3] Update Lib/test/test_enum.py Co-authored-by: Tomas R.