Changeset 6593

Timestamp:

10/21/07 19:52:54 (1 year ago)

Author:

mtredinnick

Message:

Fixed #5183 -- Added deepcopy, pop() and popitem() to SortedDict. Based on
a patch from David Blewett.

Files:

• django/trunk/django/utils/datastructures.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/datastructures/tests.py (modified) (1 diff)

django/trunk/django/utils/datastructures.py

@@ -63 +63 @@
-            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)
@@ -75 +82 @@
-        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):

django/trunk/tests/regressiontests/datastructures/tests.py

@@ -55 +55 @@
->>> 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