Changeset 6350

Timestamp:

09/15/07 22:27:38 (1 year ago)

Author:

mtredinnick

Message:

Fixed #3993 -- Added some useful dictionary methods to SortedDict, plus an insert() method. Patch from Paul Collier.

Files:

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

django/trunk/AUTHORS

@@ -84 +84 @@
-    colin@owlfish.com
-    crankycoder@gmail.com
+    Paul Collier <paul@paul-collier.com>
-    Pete Crosier <pete.crosier@gmail.com>
-    Matt Croydon <http://www.postneo.com/>

django/trunk/django/utils/datastructures.py

@@ -73 +73 @@
-        return zip(self.keyOrder, self.values())
-
+    def iteritems(self):
+        for key in self.keyOrder:
+            yield key, dict.__getitem__(self, key)
+
-    def keys(self):
-        return self.keyOrder[:]
-
+    def iterkeys(self):
+        return iter(self.keyOrder)
+
-    def values(self):
-        return [dict.__getitem__(self, k) for k in self.keyOrder]
+
+    def itervalues(self):
+        for key in self.keyOrder:
+            yield dict.__getitem__(self, key)
-
-    def update(self, dict):
@@ -91 +102 @@
-        "Returns the value of the item at the given zero-based index."
-        return self[self.keyOrder[index]]
+
+    def insert(self, index, key, value):
+        "Inserts the key, value pair before the item with the given index."
+        if key in self.keyOrder:
+            n = self.keyOrder.index(key)
+            del self.keyOrder[n]
+            if n < index: index -= 1
+        self.keyOrder.insert(index, key)
+        dict.__setitem__(self, key, value)
-
-    def copy(self):