mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-23 10:16:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Committing the patch in issue 2965, so that weakref dicts have a closer

Browse source 
interface to normal dictionaries.  keys(), values() and items() still return
iterators instead of views, but that can be fixed later (or not).
This commit is contained in:
Barry Warsaw 2008-09-04 01:42:51 +00:00
parent 6ecc5c1980
commit ecaab837b6
3 changed files with 23 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Lib/weakref.py
View file

@ -106,13 +106,13 @@ class WeakValueDictionary(collections.MutableMapping):
L.append((key, o))
return L
def iteritems(self):
def items(self):
for wr in self.data.values():
value = wr()
if value is not None:
yield wr.key, value
def iterkeys(self):
def keys(self):
return iter(self.data.keys())
def __iter__(self):
@ -130,7 +130,7 @@ class WeakValueDictionary(collections.MutableMapping):
"""
return self.data.values()
def itervalues(self):
def values(self):
for wr in self.data.values():
obj = wr()
if obj is not None:
@ -186,14 +186,6 @@ class WeakValueDictionary(collections.MutableMapping):
"""
return self.data.values()
def values(self):
L = []
for wr in self.data.values():
o = wr()
if o is not None:
L.append(o)
return L
class KeyedRef(ref):
"""Specialized reference that includes a key corresponding to the value.
@ -270,20 +262,12 @@ class WeakKeyDictionary(collections.MutableMapping):
return wr in self.data
def items(self):
L = []
for key, value in self.data.items():
o = key()
if o is not None:
L.append((o, value))
return L
def iteritems(self):
for wr, value in self.data.items():
key = wr()
if key is not None:
yield key, value
def iterkeyrefs(self):
def keyrefs(self):
"""Return an iterator that yields the weak references to the keys.
The references are not guaranteed to be 'live' at the time
@ -295,7 +279,7 @@ class WeakKeyDictionary(collections.MutableMapping):
"""
return self.data.keys()
def iterkeys(self):
def keys(self):
for wr in self.data.keys():
obj = wr()
if obj is not None:
@ -304,7 +288,7 @@ class WeakKeyDictionary(collections.MutableMapping):
def __iter__(self):
return iter(self.keys())
def itervalues(self):
def values(self):
return iter(self.data.values())
def keyrefs(self):
@ -319,14 +303,6 @@ class WeakKeyDictionary(collections.MutableMapping):
"""
return self.data.keys()
def keys(self):
L = []
for wr in self.data.keys():
o = wr()
if o is not None:
L.append(o)
return L
def popitem(self):
while 1:
key, value = self.data.popitem()