summaryrefslogtreecommitdiffstats
path: root/Lib/enum.py
diff options
context:
space:
mode:
authorEthan Furman <ethan@stoneleaf.us>2023-06-09 15:56:05 (GMT)
committerGitHub <noreply@github.com>2023-06-09 15:56:05 (GMT)
commit59f009e5898a006cdc8f5249be589de6edfe5cd0 (patch)
tree1bc9e58acd1b564fbc2fbbbc2431d823073ae5f5 /Lib/enum.py
parent8e755923c97d689ba7c7fe8deb50c1b169263264 (diff)
downloadcpython-59f009e5898a006cdc8f5249be589de6edfe5cd0.zip
cpython-59f009e5898a006cdc8f5249be589de6edfe5cd0.tar.gz
cpython-59f009e5898a006cdc8f5249be589de6edfe5cd0.tar.bz2
gh-105497: [Enum] Fix Flag inversion when alias/mask members exist. (GH-105542)
When inverting a Flag member (or boundary STRICT), only consider other canonical flags; when inverting an IntFlag member (or boundary KEEP), also consider aliases.
Diffstat (limited to 'Lib/enum.py')
-rw-r--r--Lib/enum.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/Lib/enum.py b/Lib/enum.py
index a22bcca..47e31b1 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -1439,12 +1439,11 @@ class Flag(Enum, boundary=STRICT):
else:
pseudo_member._name_ = None
# use setdefault in case another thread already created a composite
- # with this value, but only if all members are known
- # note: zero is a special case -- add it
- if not unknown:
- pseudo_member = cls._value2member_map_.setdefault(value, pseudo_member)
- if neg_value is not None:
- cls._value2member_map_[neg_value] = pseudo_member
+ # with this value
+ # note: zero is a special case -- always add it
+ pseudo_member = cls._value2member_map_.setdefault(value, pseudo_member)
+ if neg_value is not None:
+ cls._value2member_map_[neg_value] = pseudo_member
return pseudo_member
def __contains__(self, other):
@@ -1520,8 +1519,8 @@ class Flag(Enum, boundary=STRICT):
# use all bits
self._inverted_ = self.__class__(~self._value_)
else:
- # calculate flags not in this member
- self._inverted_ = self.__class__(self._flag_mask_ ^ self._value_)
+ # use canonical bits (i.e. calculate flags not in this member)
+ self._inverted_ = self.__class__(self._singles_mask_ ^ self._value_)
if isinstance(self._inverted_, self.__class__):
self._inverted_._inverted_ = self
return self._inverted_