Merged revisions 84301 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84301 | daniel.stutzbach | 2010-08-24 15:49:57 -0500 (Tue, 24 Aug 2010) | 1 line
Issue 8750: Fixed MutableSet's methods to correctly handle reflexive operations, namely x -= x and x ^= x
........
diff --git a/Lib/_abcoll.py b/Lib/_abcoll.py
index d3e23c1..cac06e0 100644
--- a/Lib/_abcoll.py
+++ b/Lib/_abcoll.py
@@ -321,18 +321,24 @@
return self
def __ixor__(self, it: Iterable):
- if not isinstance(it, Set):
- it = self._from_iterable(it)
- for value in it:
- if value in self:
- self.discard(value)
- else:
- self.add(value)
+ if it is self:
+ self.clear()
+ else:
+ if not isinstance(it, Set):
+ it = self._from_iterable(it)
+ for value in it:
+ if value in self:
+ self.discard(value)
+ else:
+ self.add(value)
return self
def __isub__(self, it: Iterable):
- for value in it:
- self.discard(value)
+ if it is self:
+ self.clear()
+ else:
+ for value in it:
+ self.discard(value)
return self
MutableSet.register(set)
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
index be41fcd..5e22afc 100644
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -494,6 +494,21 @@
s = MySet([5,43,2,1])
self.assertEqual(s.pop(), 1)
+ def test_issue8750(self):
+ empty = WithSet()
+ full = WithSet(range(10))
+ s = WithSet(full)
+ s -= s
+ self.assertEqual(s, empty)
+ s = WithSet(full)
+ s ^= s
+ self.assertEqual(s, empty)
+ s = WithSet(full)
+ s &= s
+ self.assertEqual(s, full)
+ s |= s
+ self.assertEqual(s, full)
+
def test_Mapping(self):
for sample in [dict]:
self.assertTrue(isinstance(sample(), Mapping))
diff --git a/Misc/NEWS b/Misc/NEWS
index 4c2ebe4..3344d27 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -95,6 +95,9 @@
Library
-------
+- Issue #8750: Fixed MutableSet's methods to correctly handle
+ reflexive operations, namely x -= x and x ^= x.
+
- Issue #9129: smtpd.py is vulnerable to DoS attacks deriving from missing
error handling when accepting a new connection.