Ticket #13828: 13828_dry_dictsort_3.diff

django/template/defaultfilters.py

@@ -479 +479 @@
     Takes a list of dicts, returns that list sorted by the property given in
     the argument.
     """
-    var_resolve = Variable(arg).resolve
-    decorated = [(var_resolve(item), item) for item in value]
-    decorated.sort()
-    return [item[1] for item in decorated]
+    return sorted(value, key=Variable(arg).resolve)
 dictsort.is_safe = False
 
 def dictsortreversed(value, arg):
@@ -490 +487 @@
     Takes a list of dicts, returns that list sorted in reverse order by the
     property given in the argument.
     """
-    var_resolve = Variable(arg).resolve
-    decorated = [(var_resolve(item), item) for item in value]
-    decorated.sort()
-    decorated.reverse()
-    return [item[1] for item in decorated]
+    return sorted(value, key=Variable(arg).resolve, reverse=True)
 dictsortreversed.is_safe = False
 
 def first(value):

tests/regressiontests/defaultfilters/tests.py

@@ -260 +260 @@
             u'some html with alert("You smell") disallowed  tags')
 
     def test_dictsort(self):
-        sorted_dicts = dictsort([{'age': 23, 'name': 'Barbara-Ann'},
-                                 {'age': 63, 'name': 'Ra Ra Rasputin'},
-                                 {'name': 'Jonny B Goode', 'age': 18}], 'age')
-
+        dicts = [{'age': 23, 'name': 'Barbara-Ann'},
+                 {'age': 63, 'name': 'Ra Ra Rasputin'},
+                 {'age': 18, 'name': 'Jonny B Goode'}]
+        sorted_dicts = dictsort(dicts, 'age')
         self.assertEqual([sorted(dict.items()) for dict in sorted_dicts],
             [[('age', 18), ('name', 'Jonny B Goode')],
              [('age', 23), ('name', 'Barbara-Ann')],
              [('age', 63), ('name', 'Ra Ra Rasputin')]])
+        self.assertEqual(dicts, [{'age': 23, 'name': 'Barbara-Ann'},
+                 {'age': 63, 'name': 'Ra Ra Rasputin'},
+                 {'age': 18, 'name': 'Jonny B Goode'}])
 
     def test_dictsortreversed(self):
-        sorted_dicts = dictsortreversed([{'age': 23, 'name': 'Barbara-Ann'},
-                                         {'age': 63, 'name': 'Ra Ra Rasputin'},
-                                         {'name': 'Jonny B Goode', 'age': 18}],
-                                        'age')
-
+        dicts = [{'age': 23, 'name': 'Barbara-Ann'},
+                 {'age': 63, 'name': 'Ra Ra Rasputin'},
+                 {'age': 18, 'name': 'Jonny B Goode'}]
+        sorted_dicts = dictsortreversed(dicts, 'age')
         self.assertEqual([sorted(dict.items()) for dict in sorted_dicts],
             [[('age', 63), ('name', 'Ra Ra Rasputin')],
              [('age', 23), ('name', 'Barbara-Ann')],
              [('age', 18), ('name', 'Jonny B Goode')]])
+        self.assertEqual(dicts, [{'age': 23, 'name': 'Barbara-Ann'},
+                 {'age': 63, 'name': 'Ra Ra Rasputin'},
+                 {'age': 18, 'name': 'Jonny B Goode'}])
 
     def test_first(self):
         self.assertEqual(first([0,1,2]), 0)