Ticket #15812: sorteddict.patch

django/utils/datastructures.py

@@ -175 +175 @@
             yield self[key]
 
     def update(self, dict_):
-        for k, v in dict_.iteritems():
+        if getattr(dict_, 'iteritems', None) is not None:
+            dict_ = dict_.iteritems()
+        for k, v in dict_:
+            # This works for tuples, lists, and other iterators too.
             self[k] = v
 
     def setdefault(self, key, default):

tests/regressiontests/utils/datastructures.py

@@ -114 +114 @@
         d = SortedDict(((1, "one"), (0, "zero"), (2, "two")))
         self.assertEqual(repr(d), "{1: 'one', 0: 'zero', 2: 'two'}")
 
+
+    def test_tuple_update(self):
+        d = SortedDict()
+        d.update(((1, "one"), (0, "zero"), (2, "two")))
+        self.assertEqual(repr(d), "{1: 'one', 0: 'zero', 2: 'two'}")
+
+    def test_generator_update(self):
+        def some_generator():
+            for i in range(3, 0, -1):
+                yield (i, 'o' * i)
+        d = SortedDict()
+        d.update(some_generator())
+        self.assertEqual(repr(d), "{3: 'ooo', 2: 'oo', 1: 'o'}")
+
+
     def test_pickle(self):
         self.assertEqual(
             pickle.loads(pickle.dumps(self.d1, 2)),