Merged revisions 60408-60440 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60425 | raymond.hettinger | 2008-01-29 20:52:09 +0100 (Tue, 29 Jan 2008) | 1 line
CallMethod is faster with a NULL third-argument than with an empty format string.
........
r60431 | raymond.hettinger | 2008-01-30 01:01:07 +0100 (Wed, 30 Jan 2008) | 1 line
Add isdisjoint() to the Set/MutableSet ABCs.
........
r60432 | raymond.hettinger | 2008-01-30 01:08:31 +0100 (Wed, 30 Jan 2008) | 1 line
MutableSets support a remove() method.
........
r60433 | raymond.hettinger | 2008-01-30 01:51:58 +0100 (Wed, 30 Jan 2008) | 1 line
Demonstrate new except/as syntax.
........
r60440 | christian.heimes | 2008-01-30 12:32:37 +0100 (Wed, 30 Jan 2008) | 1 line
Patch #1970 by Antoine Pitrou: Speedup unicode whitespace and linebreak detection. The speedup is about 25% for split() (571 / 457 usec) and 35% (175 / 127 usec )for splitlines()
........
diff --git a/Lib/_abcoll.py b/Lib/_abcoll.py
index 36d39cf..4ce3df4 100644
--- a/Lib/_abcoll.py
+++ b/Lib/_abcoll.py
@@ -211,6 +211,12 @@
return NotImplemented
return self._from_iterable(value for value in other if value in self)
+ def isdisjoint(self, other):
+ for value in other:
+ if value in self:
+ return False
+ return True
+
def __or__(self, other):
if not isinstance(other, Iterable):
return NotImplemented
@@ -278,6 +284,12 @@
"""Return True if it was deleted, False if not there."""
raise NotImplementedError
+ def remove(self, value):
+ """Remove an element. If not a member, raise a KeyError."""
+ if value not in self:
+ raise KeyError(value)
+ self.discard(value)
+
def pop(self):
"""Return the popped value. Raise KeyError if empty."""
it = iter(self)