Ticket #6904: 6904_revision7393_better.diff

django/template/defaultfilters.py

@@ -416 +416 @@
     Takes a list of dicts, returns that list sorted by the property given in
     the argument.
     """
+    def lower_if_string(object):
+        # Use try/except because I would expect most objects
+        # to be strings...
+        try:
+            return object.lower()
+        except AttributeError:
+            return object
     var_resolve = Variable(arg).resolve
-    decorated = [(var_resolve(item), item) for item in value]
+    decorated = [(lower_if_string(var_resolve(item)), item) for item in value]
     decorated.sort()
     return [item[1] for item in decorated]
 dictsort.is_safe = False
@@ -427 +434 @@
     Takes a list of dicts, returns that list sorted in reverse order by the
     property given in the argument.
     """
+    def lower_if_string(object):
+        # Use try/except because I would expect most objects
+        # to be strings...
+        try:
+            return object.lower()
+        except AttributeError:
+            return object
+            
     var_resolve = Variable(arg).resolve
-    decorated = [(var_resolve(item), item) for item in value]
+    decorated = [(lower_if_string(var_resolve(item)), item) for item in value]
     decorated.sort()
     decorated.reverse()
     return [item[1] for item in decorated]

tests/regressiontests/defaultfilters/tests.py

@@ -236 +236 @@
 ...           {'name': 'Jonny B Goode', 'age': 18}], 'age')
 [{'age': 63, 'name': 'Ra Ra Rasputin'}, {'age': 23, 'name': 'Barbara-Ann'}, {'age': 18, 'name': 'Jonny B Goode'}]
 
+>>> dictsort([{'age': 23, 'name': 'Barbara-Ann'},
+...           {'age': 63, 'name': 'Ra Ra Rasputin'},
+...           {'name': 'jonny B Goode', 'age': 18}], 'name')
+[{'age': 23, 'name': 'Barbara-Ann'}, {'age': 18, 'name': 'jonny B Goode'}, {'age': 63, 'name': 'Ra Ra Rasputin'}]
+
+>>> dictsortreversed([{'age': 23, 'name': 'Barbara-Ann'},
+...           {'age': 63, 'name': 'Ra Ra Rasputin'},
+...           {'name': 'jonny B Goode', 'age': 18}], 'name')
+[{'age': 63, 'name': 'Ra Ra Rasputin'}, {'age': 18, 'name': 'jonny B Goode'}, {'age': 23, 'name': 'Barbara-Ann'}]
+
 >>> first([0,1,2])
 0