Browse files

Fixed #19882 -- Smarter tokenizing of {% for %} tag arguments.

  • Loading branch information...
1 parent 5488437 commit f13bfbec70e096f230e3dcda88a2cb215e7f8899 @bmispelon bmispelon committed Feb 22, 2013
Showing with 3 additions and 1 deletion.
  1. +1 −1 django/template/defaulttags.py
  2. +2 −0 tests/regressiontests/templates/tests.py
View
2 django/template/defaulttags.py
@@ -746,7 +746,7 @@ def do_for(parser, token):
========================== ================================================
"""
- bits = token.contents.split()
+ bits = token.split_contents()
if len(bits) < 4:
raise TemplateSyntaxError("'for' statements should have at least four"
" words: %s" % token.contents)
View
2 tests/regressiontests/templates/tests.py
@@ -833,6 +833,8 @@ def get_template_tests(self):
'for-tag-empty01': ("{% for val in values %}{{ val }}{% empty %}empty text{% endfor %}", {"values": [1, 2, 3]}, "123"),
'for-tag-empty02': ("{% for val in values %}{{ val }}{% empty %}values array empty{% endfor %}", {"values": []}, "values array empty"),
'for-tag-empty03': ("{% for val in values %}{{ val }}{% empty %}values array not found{% endfor %}", {}, "values array not found"),
+ # Ticket 19882
+ 'for-tag-filter-ws': ("{% for x in ''|add:'a b c' %}{{ x }}{% endfor %}", {}, 'a b c'),
### IF TAG ################################################################
'if-tag01': ("{% if foo %}yes{% else %}no{% endif %}", {"foo": True}, "yes"),

0 comments on commit f13bfbe

Please sign in to comment.