Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.2.X] Fixed #12965 - unordered_list template filter fails when give…

…n a non-iterable second item in a two item list

Thanks to grahamu for the report and patch.

Backport of [13845] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13846 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 93e83546a35f268a4bbf0a9b30186fc4ee1b0885 1 parent 21f60e9
@spookylukey spookylukey authored
View
4 django/template/defaultfilters.py
@@ -601,6 +601,10 @@ def convert_old_style_list(list_):
first_item, second_item = list_
if second_item == []:
return [first_item], True
+ try:
+ it = iter(second_item) # see if second item is iterable
+ except TypeError:
+ return list_, False
old_style_list = True
new_second_item = []
for sublist in second_item:
View
11 tests/regressiontests/defaultfilters/tests.py
@@ -347,6 +347,17 @@
>>> unordered_list(['States', ['Kansas', ['Lawrence', 'Topeka'], 'Illinois']])
u'\t<li>States\n\t<ul>\n\t\t<li>Kansas\n\t\t<ul>\n\t\t\t<li>Lawrence</li>\n\t\t\t<li>Topeka</li>\n\t\t</ul>\n\t\t</li>\n\t\t<li>Illinois</li>\n\t</ul>\n\t</li>'
+>>> class ULItem(object):
+... def __init__(self, title):
+... self.title = title
+... def __unicode__(self):
+... return u'ulitem-%s' % str(self.title)
+
+>>> a = ULItem('a')
+>>> b = ULItem('b')
+>>> unordered_list([a,b])
+u'\t<li>ulitem-a</li>\n\t<li>ulitem-b</li>'
+
# Old format for unordered lists should still work
>>> unordered_list([u'item 1', []])
u'\t<li>item 1</li>'
Please sign in to comment.
Something went wrong with that request. Please try again.