Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #5183 -- Added __deepcopy__, pop() and popitem() to SortedDict.…

… Based on

a patch from David Blewett.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6593 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit dbd1cb9083db8a0206a4b951813f4c8291afa824 1 parent 375a6d7
Malcolm Tredinnick malcolmt authored
21 django/utils/datastructures.py
View
@@ -62,6 +62,13 @@ def __init__(self, data=None):
else:
self.keyOrder = [key for key, value in data]
+ def __deepcopy__(self,memo):
+ from copy import deepcopy
+ obj = self.__class__()
+ for k, v in self.items():
+ obj[k] = deepcopy(v, memo)
+ return obj
+
def __setitem__(self, key, value):
dict.__setitem__(self, key, value)
if key not in self.keyOrder:
@@ -75,6 +82,20 @@ def __iter__(self):
for k in self.keyOrder:
yield k
+ def pop(self, k, *args):
+ result = dict.pop(self, k, *args)
+ try:
+ self.keyOrder.remove(k)
+ except ValueError:
+ # Key wasn't in the dictionary in the first place. No problem.
+ pass
+ return result
+
+ def popitem(self):
+ result = dict.popitem(self)
+ self.keyOrder.remove(result[0])
+ return result
+
def items(self):
return zip(self.keyOrder, self.values())
11 tests/regressiontests/datastructures/tests.py
View
@@ -54,6 +54,17 @@
True
>>> print repr(d)
{'one': 'not one', 'two': 'two', 'three': 'three'}
+>>> d.pop('one', 'missing')
+'not one'
+>>> d.pop('one', 'missing')
+'missing'
+
+We don't know which item will be popped in popitem(), so we'll just check that
+the number of keys has decreased.
+>>> l = len(d)
+>>> _ = d.popitem()
+>>> l - len(d)
+1
Init from sequence of tuples
>>> d = SortedDict((
Please sign in to comment.
Something went wrong with that request. Please try again.