Skip to content
Browse files

Fixed #11874 -- Optimizations and cleanups for SortedDict. Thanks to …

…Alex Gaynor and Armin Ronacher for the report and patch.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 7cb8892 commit 333615accb6de0682a18bd5a512112832e01727a @freakboy3742 freakboy3742 committed
Showing with 17 additions and 16 deletions.
  1. +17 −16 django/utils/
33 django/utils/
@@ -1,3 +1,6 @@
+from copy import deepcopy
class MergeDict(object):
A simple class for creating new "virtual" dictionaries that actually look
@@ -72,22 +75,20 @@ def __init__(self, data=None):
def __deepcopy__(self, memo):
- from copy import deepcopy
return self.__class__([(key, deepcopy(value, memo))
for key, value in self.iteritems()])
def __setitem__(self, key, value):
- super(SortedDict, self).__setitem__(key, value)
- if key not in self.keyOrder:
+ if key not in self:
+ super(SortedDict, self).__setitem__(key, value)
def __delitem__(self, key):
super(SortedDict, self).__delitem__(key)
def __iter__(self):
- for k in self.keyOrder:
- yield k
+ return iter(self.keyOrder)
def pop(self, k, *args):
result = super(SortedDict, self).pop(k, *args)
@@ -108,7 +109,7 @@ def items(self):
def iteritems(self):
for key in self.keyOrder:
- yield key, super(SortedDict, self).__getitem__(key)
+ yield key, self[key]
def keys(self):
return self.keyOrder[:]
@@ -117,18 +118,18 @@ def iterkeys(self):
return iter(self.keyOrder)
def values(self):
- return map(super(SortedDict, self).__getitem__, self.keyOrder)
+ return map(self.__getitem__, self.keyOrder)
def itervalues(self):
for key in self.keyOrder:
- yield super(SortedDict, self).__getitem__(key)
+ yield self[key]
def update(self, dict_):
- for k, v in dict_.items():
- self.__setitem__(k, v)
+ for k, v in dict_.iteritems():
+ self[k] = v
def setdefault(self, key, default):
- if key not in self.keyOrder:
+ if key not in self:
return super(SortedDict, self).setdefault(key, default)
@@ -222,18 +223,18 @@ def __deepcopy__(self, memo=None):
dict.__setitem__(result, copy.deepcopy(key, memo),
copy.deepcopy(value, memo))
return result
def __getstate__(self):
obj_dict = self.__dict__.copy()
obj_dict['_data'] = dict([(k, self.getlist(k)) for k in self])
return obj_dict
def __setstate__(self, obj_dict):
data = obj_dict.pop('_data', {})
for k, v in data.items():
self.setlist(k, v)
def get(self, key, default=None):
Returns the last data value for the passed key. If key doesn't exist
@@ -301,12 +302,12 @@ def iterlists(self):
def values(self):
"""Returns a list of the last value on every key list."""
return [self[key] for key in self.keys()]
def itervalues(self):
"""Yield the last value on every key list."""
for key in self.iterkeys():
yield self[key]
def copy(self):
"""Returns a copy of this object."""
return self.__deepcopy__()

0 comments on commit 333615a

Please sign in to comment.
Something went wrong with that request. Please try again.