innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #4746 -- Allowed spaces around filter separator.

This commit is contained in:
Aymeric Augustin 2012-04-30 21:01:06 +02:00
parent 78ba9670af
commit ddfc7c2530
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/template/base.py
View File

@ -486,7 +486,7 @@ constant_string = constant_string.replace("\n", "")
filter_raw_string = r""" filter_raw_string = r"""
^(?P<constant>%(constant)s)| ^(?P<constant>%(constant)s)|
^(?P<var>[%(var_chars)s]+|%(num)s)| ^(?P<var>[%(var_chars)s]+|%(num)s)|
(?:%(filter_sep)s (?:\s*%(filter_sep)s\s*
(?P<filter_name>\w+) (?P<filter_name>\w+)
(?:%(arg_sep)s (?:%(arg_sep)s
(?: (?:

8
tests/regressiontests/templates/tests.py
View File

@ -634,11 +634,11 @@ class Templates(unittest.TestCase):
# Chained filters # Chained filters
'filter-syntax02': ("{{ var|upper|lower }}", {"var": "Django is the greatest!"}, "django is the greatest!"), 'filter-syntax02': ("{{ var|upper|lower }}", {"var": "Django is the greatest!"}, "django is the greatest!"),
# Raise TemplateSyntaxError for space between a variable and filter pipe # Allow spaces before the filter pipe
'filter-syntax03': ("{{ var |upper }}", {}, template.TemplateSyntaxError), 'filter-syntax03': ("{{ var |upper }}", {"var": "Django is the greatest!"}, "DJANGO IS THE GREATEST!"),
# Raise TemplateSyntaxError for space after a filter pipe # Allow spaces after the filter pipe
'filter-syntax04': ("{{ var| upper }}", {}, template.TemplateSyntaxError), 'filter-syntax04': ("{{ var| upper }}", {"var": "Django is the greatest!"}, "DJANGO IS THE GREATEST!"),
# Raise TemplateSyntaxError for a nonexistent filter # Raise TemplateSyntaxError for a nonexistent filter
'filter-syntax05': ("{{ var|does_not_exist }}", {}, template.TemplateSyntaxError), 'filter-syntax05': ("{{ var|does_not_exist }}", {}, template.TemplateSyntaxError),