Issue #14159: Fix the len() of weak containers (WeakSet, WeakKeyDictionary, WeakValueDictionary) to return a better approximation when some objects are dead or dying.

Moreover, the implementation is now O(1) rather than O(n).
Thanks to Yury Selivanov for reporting.
This commit is contained in:
Antoine Pitrou 2012-03-01 16:26:35 +01:00
parent eb977dac9c
commit bbe2f60b3c
5 changed files with 115 additions and 3 deletions

View file

@ -78,7 +78,7 @@ class WeakValueDictionary(collections.MutableMapping):
del self.data[key]
def __len__(self):
return sum(wr() is not None for wr in self.data.values())
return len(self.data) - len(self._pending_removals)
def __contains__(self, key):
try:
@ -290,7 +290,7 @@ class WeakKeyDictionary(collections.MutableMapping):
return self.data[ref(key)]
def __len__(self):
return len(self.data)
return len(self.data) - len(self._pending_removals)
def __repr__(self):
return "<WeakKeyDictionary at %s>" % id(self)