From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Fri, 25 Apr 2025 20:30:33 +0000 (+0200) Subject: [3.13] gh-132684: [Enum] only call _missing_ in __contains__ for Flags (GH-132790... X-Git-Tag: v3.13.4~221 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08772229c77b1492efc59abde954191744147f9d;p=thirdparty%2FPython%2Fcpython.git [3.13] gh-132684: [Enum] only call _missing_ in __contains__ for Flags (GH-132790) (GH-132896) gh-132684: [Enum] only call _missing_ in __contains__ for Flags (GH-132790) (cherry picked from commit 22bc953aa9be3039629dd1315f856d2522619412) Co-authored-by: Ethan Furman Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> --- diff --git a/Lib/enum.py b/Lib/enum.py index 9cab804115e4..e9fc1a7fa734 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -750,14 +750,16 @@ class EnumType(type): """ 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 18193ad2808b..73ae53a3694d 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -1583,6 +1583,17 @@ class TestSpecial(unittest.TestCase): 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'