mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-25 02:26:12 +00:00
Code Issues 25 Releases Wiki Activity

Fixed #10094 -- Fixed the include and extends template tags to work with filenames with spaces, patch from mcroydon.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10211 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Gary Wilson Jr 2009-03-30 20:30:28 +00:00
parent 9ac3905f01
commit 86c5142461
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/template/loader_tags.py
View File

@ -158,7 +158,7 @@ def do_extends(parser, token):
name of the parent template to extend (if it evaluates to a string) or as
the parent tempate itelf (if it evaluates to a Template object).
"""
bits = token.contents.split()
bits = token.split_contents()
if len(bits) != 2:
raise TemplateSyntaxError, "'%s' takes one argument" % bits[0]
parent_name, parent_name_expr = None, None
@ -179,7 +179,7 @@ def do_include(parser, token):
{% include "foo/some_include" %}
"""
bits = token.contents.split()
bits = token.split_contents()
if len(bits) != 2:
raise TemplateSyntaxError, "%r tag takes one argument: the name of the template to be included" % bits[0]
path = bits[1]

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

@ -661,6 +661,8 @@ class Templates(unittest.TestCase):
'include02': ('{% include "basic-syntax02" %}', {'headline': 'Included'}, "Included"),
'include03': ('{% include template_name %}', {'template_name': 'basic-syntax02', 'headline': 'Included'}, "Included"),
'include04': ('a{% include "nonexistent" %}b', {}, "ab"),
'include 05': ('template with a space', {}, 'template with a space'),
'include06': ('{% include "include 05"%}', {}, 'template with a space'),
### NAMED ENDBLOCKS #######################################################
@ -760,6 +762,12 @@ class Templates(unittest.TestCase):
# Inheritance from a template that doesn't have any blocks
'inheritance27': ("{% extends 'inheritance26' %}", {}, 'no tags'),
# Set up a base template with a space in it.
'inheritance 28': ("{% block first %}!{% endblock %}", {}, '!'),
# Inheritance from a template with a space in its name should work.
'inheritance29': ("{% extends 'inheritance 28' %}", {}, '!'),
### I18N ##################################################################
# {% spaceless %} tag