Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #4746 -- Allowed spaces around filter separator.

  • Loading branch information...
commit ddfc7c2530197112fb105b6dd237574bc2fd6b49 1 parent 78ba967
Aymeric Augustin aaugustin authored
2  django/template/base.py
View
@@ -486,7 +486,7 @@ def next_space_index(subject, i):
filter_raw_string = r"""
^(?P<constant>%(constant)s)|
^(?P<var>[%(var_chars)s]+|%(num)s)|
- (?:%(filter_sep)s
+ (?:\s*%(filter_sep)s\s*
(?P<filter_name>\w+)
(?:%(arg_sep)s
(?:
8 tests/regressiontests/templates/tests.py
View
@@ -634,11 +634,11 @@ def get_template_tests(self):
# Chained filters
'filter-syntax02': ("{{ var|upper|lower }}", {"var": "Django is the greatest!"}, "django is the greatest!"),
- # Raise TemplateSyntaxError for space between a variable and filter pipe
- 'filter-syntax03': ("{{ var |upper }}", {}, template.TemplateSyntaxError),
+ # Allow spaces before the filter pipe
+ 'filter-syntax03': ("{{ var |upper }}", {"var": "Django is the greatest!"}, "DJANGO IS THE GREATEST!"),
- # Raise TemplateSyntaxError for space after a filter pipe
- 'filter-syntax04': ("{{ var| upper }}", {}, template.TemplateSyntaxError),
+ # Allow spaces after the filter pipe
+ 'filter-syntax04': ("{{ var| upper }}", {"var": "Django is the greatest!"}, "DJANGO IS THE GREATEST!"),
# Raise TemplateSyntaxError for a nonexistent filter
'filter-syntax05': ("{{ var|does_not_exist }}", {}, template.TemplateSyntaxError),
Please sign in to comment.
Something went wrong with that request. Please try again.