From d898299b3faf4bb0c5a0db1ff51a4e82061bbf1d Mon Sep 17 00:00:00 2001 From: Ethan Furman Date: Thu, 24 Apr 2025 23:13:54 -0700 Subject: [PATCH] gh-132684: [Enum] only call _missing_ in __contains__ for Flags (GH-132790) (cherry picked from commit 22bc953aa9be3039629dd1315f856d2522619412) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ethan Furman Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> --- Lib/enum.py | 18 ++++++++++-------- Lib/test/test_enum.py | 11 +++++++++++ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/Lib/enum.py b/Lib/enum.py index 9cab804115e484..e9fc1a7fa73465 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -750,14 +750,16 @@ def __contains__(cls, value): """ if isinstance(value, cls): return True - try: - cls(value) - return True - except ValueError: - return ( - value in cls._unhashable_values_ # both structures are lists - or value in cls._hashable_values_ - ) + if issubclass(cls, Flag): + try: + result = cls._missing_(value) + return isinstance(result, cls) + except ValueError: + pass + 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 18193ad2808b21..73ae53a3694dca 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -1583,6 +1583,17 @@ class IntFlag1(IntFlag): self.assertIn(IntEnum1.X, IntFlag1) self.assertIn(IntFlag1.X, IntEnum1) + def test_contains_does_not_call_missing(self): + class AnEnum(Enum): + UNKNOWN = None + LUCKY = 3 + @classmethod + def _missing_(cls, *values): + return cls.UNKNOWN + self.assertTrue(None in AnEnum) + self.assertTrue(3 in AnEnum) + self.assertFalse(7 in AnEnum) + def test_inherited_data_type(self): class HexInt(int): __qualname__ = 'HexInt'