Ticket #3184: defaultfilters.4.diff

django/template/defaultfilters.py

@@ -5 +5 @@
 from django.utils.translation import gettext
 import re
 import random as random_module
+from types import StringTypes, ListType
 
 register = Library()
 
@@ -287 +288 @@
         </ul>
         </li>
     """
-    def _helper(value, tabs):
+    def _create(value, tabs):
         indent = '\t' * tabs
         if value[1]:
             return '%s<li>%s\n%s<ul>\n%s\n%s</ul>\n%s</li>' % (indent, value[0], indent,
                 '\n'.join([_helper(v, tabs+1) for v in value[1]]), indent, indent)
         else:
             return '%s<li>%s</li>' % (indent, value[0])
+
+    def _helper(value, tabs):
+        if type(value) != ListType:
+            value = [value]
+        l = len(value)
+        if l == 0:
+            return ''
+        else:
+            html = []
+            i = 0
+            while i < l:
+                if type(value[i]) == ListType:
+                    html.append(_create(['', value[i]], tabs))
+                    i += 1
+                    continue
+                elif i < l-1 and type(value[i+1]) == ListType:
+                    html.append(_create([value[i], value[i+1]], tabs))
+                    i += 2
+                    continue
+                else:
+                    html.append(_create([value[i], []], tabs))
+                i += 1
+            return '\n'.join(html)
+
     return _helper(value, 1)
 
 ###################