mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-09 19:38:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

[3.12] gh-115539: Allow enum.Flag to have None members (GH-115636) (GH-115694)

Browse source 
gh-115539: Allow enum.Flag to have None members (GH-115636)
(cherry picked from commit c2cb31bbe1)

Co-authored-by: Jason Zhang <yurenzhang2017@gmail.com>
This commit is contained in:
Miss Islington (bot) 2024-02-20 01:18:40 +01:00 • committed by GitHub
parent eb745733fe
commit e4fd5d542a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 52 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

57
Lib/enum.py
View file

@ -283,9 +283,10 @@ class _proto_member:
enum_member._sort_order_ = len(enum_class._member_names_) enum_member._sort_order_ = len(enum_class._member_names_)
if Flag is not None and issubclass(enum_class, Flag): if Flag is not None and issubclass(enum_class, Flag):
enum_class._flag_mask_ |= value if isinstance(value, int):
if _is_single_bit(value): enum_class._flag_mask_ |= value
enum_class._singles_mask_ |= value if _is_single_bit(value):
enum_class._singles_mask_ |= value
enum_class._all_bits_ = 2 ** ((enum_class._flag_mask_).bit_length()) - 1 enum_class._all_bits_ = 2 ** ((enum_class._flag_mask_).bit_length()) - 1
# If another member with the same value was already defined, the # If another member with the same value was already defined, the
@ -313,6 +314,7 @@ class _proto_member:
elif ( elif (
Flag is not None Flag is not None
and issubclass(enum_class, Flag) and issubclass(enum_class, Flag)
and isinstance(value, int)
and _is_single_bit(value) and _is_single_bit(value)
): ):
# no other instances found, record this member in _member_names_ # no other instances found, record this member in _member_names_
@ -1534,37 +1536,50 @@ class Flag(Enum, boundary=STRICT):
def __bool__(self): def __bool__(self):
return bool(self._value_) return bool(self._value_)
def _get_value(self, flag):
if isinstance(flag, self.__class__):
return flag._value_
elif self._member_type_ is not object and isinstance(flag, self._member_type_):
return flag
return NotImplemented
def __or__(self, other): def __or__(self, other):
if isinstance(other, self.__class__): other_value = self._get_value(other)
other = other._value_ if other_value is NotImplemented:
elif self._member_type_ is not object and isinstance(other, self._member_type_):
other = other
else:
return NotImplemented return NotImplemented
for flag in self, other:
if self._get_value(flag) is None:
raise TypeError(f"'{flag}' cannot be combined with other flags with |")
value = self._value_ value = self._value_
return self.__class__(value | other) return self.__class__(value | other_value)
def __and__(self, other): def __and__(self, other):
if isinstance(other, self.__class__): other_value = self._get_value(other)
other = other._value_ if other_value is NotImplemented:
elif self._member_type_ is not object and isinstance(other, self._member_type_):
other = other
else:
return NotImplemented return NotImplemented
for flag in self, other:
if self._get_value(flag) is None:
raise TypeError(f"'{flag}' cannot be combined with other flags with &")
value = self._value_ value = self._value_
return self.__class__(value & other) return self.__class__(value & other_value)
def __xor__(self, other): def __xor__(self, other):
if isinstance(other, self.__class__): other_value = self._get_value(other)
other = other._value_ if other_value is NotImplemented:
elif self._member_type_ is not object and isinstance(other, self._member_type_):
other = other
else:
return NotImplemented return NotImplemented
for flag in self, other:
if self._get_value(flag) is None:
raise TypeError(f"'{flag}' cannot be combined with other flags with ^")
value = self._value_ value = self._value_
return self.__class__(value ^ other) return self.__class__(value ^ other_value)
def __invert__(self): def __invert__(self):
if self._get_value(self) is None:
raise TypeError(f"'{self}' cannot be inverted")
if self._inverted_ is None: if self._inverted_ is None:
if self._boundary_ in (EJECT, KEEP): if self._boundary_ in (EJECT, KEEP):
self._inverted_ = self.__class__(~self._value_) self._inverted_ = self.__class__(~self._value_)

16
Lib/test/test_enum.py
View file

@ -1007,6 +1007,22 @@ class TestPlainEnumFunction(_EnumTests, _PlainOutputTests, unittest.TestCase):
class TestPlainFlagClass(_EnumTests, _PlainOutputTests, _FlagTests, unittest.TestCase): class TestPlainFlagClass(_EnumTests, _PlainOutputTests, _FlagTests, unittest.TestCase):
enum_type = Flag enum_type = Flag
def test_none_member(self):
class FlagWithNoneMember(Flag):
A = 1
E = None
self.assertEqual(FlagWithNoneMember.A.value, 1)
self.assertIs(FlagWithNoneMember.E.value, None)
with self.assertRaisesRegex(TypeError, r"'FlagWithNoneMember.E' cannot be combined with other flags with |"):
FlagWithNoneMember.A | FlagWithNoneMember.E
with self.assertRaisesRegex(TypeError, r"'FlagWithNoneMember.E' cannot be combined with other flags with &"):
FlagWithNoneMember.E & FlagWithNoneMember.A
with self.assertRaisesRegex(TypeError, r"'FlagWithNoneMember.E' cannot be combined with other flags with \^"):
FlagWithNoneMember.A ^ FlagWithNoneMember.E
with self.assertRaisesRegex(TypeError, r"'FlagWithNoneMember.E' cannot be inverted"):
~FlagWithNoneMember.E
class TestPlainFlagFunction(_EnumTests, _PlainOutputTests, _FlagTests, unittest.TestCase): class TestPlainFlagFunction(_EnumTests, _PlainOutputTests, _FlagTests, unittest.TestCase):
enum_type = Flag enum_type = Flag