Ticket #3184: better-unordered.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()
 
@@ -305 +306 @@
         </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)
 
 ###################

tests/regressiontests/defaultfilters/tests.py

@@ -223 +223 @@
 >>> unordered_list(['item 1', [['item 1.1', []], ['item 1.2', []]]])
 '\t<li>item 1\n\t<ul>\n\t\t<li>item 1.1</li>\n\t\t<li>item 1.2</li>\n\t</ul>\n\t</li>'
 
+>>> unordered_list([[['item 1.1', []], ['item 1.2', []]]])
+'\t<li>\n\t<ul>\n\t\t<li>item 1.1</li>\n\t\t<li>item 1.2</li>\n\t</ul>\n\t</li>'
+
+>>> unordered_list(['item 1'])
+'\t<li>item 1</li>'
+
+>>> unordered_list(['item 1', ['item 1.1']])
+'\t<li>item 1\n\t<ul>\n\t\t<li>item 1.1</li>\n\t</ul>\n\t</li>'
+
+>>> unordered_list(['item 1', ['item 1.1', 'item 1.2']])
+'\t<li>item 1\n\t<ul>\n\t\t<li>item 1.1</li>\n\t\t<li>item 1.2</li>\n\t</ul>\n\t</li>'
+
+>>> unordered_list([['item 1.1', 'item 1.2'], 'item 2'])
+'\t<li>\n\t<ul>\n\t\t<li>item 1.1</li>\n\t\t<li>item 1.2</li>\n\t</ul>\n\t</li>\n\t<li>item 2</li>'
+
+>>> unordered_list(['item 1', ['item 1.1'], 'item 2'])
+'\t<li>item 1\n\t<ul>\n\t\t<li>item 1.1</li>\n\t</ul>\n\t</li>\n\t<li>item 2</li>'
+
+>>> unordered_list(['item 1', ['item 1.1', 'item 1.2'], 'item 2'])
+'\t<li>item 1\n\t<ul>\n\t\t<li>item 1.1</li>\n\t\t<li>item 1.2</li>\n\t</ul>\n\t</li>\n\t<li>item 2</li>'
+
+>>> unordered_list([['item 1.1', 'item 1.2'], ['item 2.1', 'item 2.2']])
+'\t<li>\n\t<ul>\n\t\t<li>item 1.1</li>\n\t\t<li>item 1.2</li>\n\t</ul>\n\t</li>\n\t<li>\n\t<ul>\n\t\t<li>item 2.1</li>\n\t\t<li>item 2.2</li>\n\t</ul>\n\t</li>'
+
+>>> unordered_list([['item 1.1']])
+'\t<li>\n\t<ul>\n\t\t<li>item 1.1</li>\n\t</ul>\n\t</li>'
+
+# reported by simonbun <simonbun@versea.be> 
+# this is not working correct
+#>>> unordered_list(['page1', ['page2', ['page3', ['page4']]]])
+#'\t<li>page1\n\t<ul>\n\t\t<li>page2\n\t\t<ul>\n\t\t\t<li>page3\n\t\t\t<ul>\n\t\t\t\t<li>page4</li>\n\t\t\t</ul>\n\t\t\t</li>\n\t\t</ul>\n\t\t</li>\n\t</ul>\n\t</li>'
+
+# this will be outputed, but it is not correct
+>>> unordered_list(['page1', ['page2', ['page3', ['page4']]]])
+'\t<li>page1\n\t<ul>\n\t\t<li>page2</li>\n\t\t<li>page3\n\t\t<ul>\n\t\t\t<li>page4</li>\n\t\t</ul>\n\t\t</li>\n\t</ul>\n\t</li>'
+
+# instead this will work, expected by the original unordered algorithm
+>>> unordered_list(['page1', [['page2', [['page3', [['page4', []]]]]]]])
+'\t<li>page1\n\t<ul>\n\t\t<li>page2\n\t\t<ul>\n\t\t\t<li>page3\n\t\t\t<ul>\n\t\t\t\t<li>page4</li>\n\t\t\t</ul>\n\t\t\t</li>\n\t\t</ul>\n\t\t</li>\n\t</ul>\n\t</li>'
+
 >>> add('1', '2')
 3