Ticket #16647: django-defaultfilters-random-shuffle.path

Index: template/defaultfilters.py
===================================================================
--- template/defaultfilters.py  (revision 16332)
+++ template/defaultfilters.py  (working copy)
@@ -15,6 +15,7 @@
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe, SafeData
 from django.utils.translation import ugettext, ungettext
+from django.db.models.query import QuerySet
 
 register = Library()
 
@@ -529,10 +530,24 @@
 length_is.is_safe = False
 
 def random(value):
-    """Returns a random item from the list."""
-    return random_module.choice(value)
+    """Returns a random item from a list or QuerySet"""
+    if not isinstance(value, QuerySet):
+        return random_module.choice(value)
+    else:
+        if len(value) == 0:
+            return []
+        return value.order_by('?')[0]
 random.is_safe = True
 
+def shuffle(value):
+    """Returns a randomized list or QuerySet"""
+    if not isinstance(value, QuerySet):
+        random_module.shuffle(value)
+        return value
+    else:
+        return value.order_by('?')
+shuffle.is_safe = True
+
 def slice_(value, arg):
     """
     Returns a slice of the list.
@@ -914,6 +929,7 @@
 register.filter(pprint)
 register.filter(removetags)
 register.filter(random)
+register.filter(shuffle)
 register.filter(rjust)
 register.filter(safe)
 register.filter(safeseq)