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

Backport 70140, 70141, 70143, and 70144.

Browse source 
Adds tests, switches from list to deque, fixes __reduce__
which was unnecessarily copying __keys.
This commit is contained in:
Raymond Hettinger 2009-03-03 22:59:25 +00:00
parent 288618e1a7
commit 131af6505a
2 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/collections.py
View file

@ -27,11 +27,11 @@ class OrderedDict(dict, MutableMapping):
except AttributeError:
# Note the underlying data structure for this class is likely to
# change in the future. Do not rely on it or access it directly.
self.__keys = []
self.__keys = deque()
self.update(*args, **kwds)
def clear(self):
del self.__keys[:]
self.__keys.clear()
dict.clear(self)
def __setitem__(self, key, value):
@ -58,16 +58,20 @@ class OrderedDict(dict, MutableMapping):
def __reduce__(self):
items = [[k, self[k]] for k in self]
tmp = self.__keys
del self.__keys
inst_dict = vars(self).copy()
inst_dict.pop('__keys', None)
return (self.__class__, (items,), inst_dict)
self.__keys = tmp
if inst_dict:
return (self.__class__, (items,), inst_dict)
return self.__class__, (items,)
setdefault = MutableMapping.setdefault
update = MutableMapping.update
pop = MutableMapping.pop
def keys(self):
return self.__keys[:]
return list(self.__keys)
def values(self):
return map(self.__getitem__, self.__keys)