Commit fd2efb35 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

[1.3.X] Fixed #16677 -- Fixed the future version of the ssi template tag to... 

[1.3.X] Fixed #16677 -- Fixed the future version of the ssi template tag to work with template file names that contain spaces. Backport of r16687 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@17804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 651c0414

django/templatetags/future.py

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ def ssi(parser, token): 


        {% ssi "/home/html/ljworld.com/includes/right_generic.html" parsed %}

    """

    bits = token.contents.split()

    bits = token.split_contents()

    parsed = False

    if len(bits) not in (2, 3):

        raise TemplateSyntaxError("'ssi' tag takes one argument: the path to"

tests/regressiontests/templates/templates/ssi include with spaces.html

0 → 100644
+1 −0
Original line number Diff line number Diff line 
This is for testing an ssi include with spaces in its name. {{ test }}

tests/regressiontests/templates/tests.py

+29 −11
Original line number Diff line number Diff line
@@ -507,7 +507,8 @@ class Templates(unittest.TestCase): 
    def get_template_tests(self):

        # SYNTAX --

        # 'template_name': ('template contents', 'context dict', 'expected string output' or Exception class)

        return {

        basedir = os.path.dirname(os.path.abspath(__file__))

        tests = {

            ### BASIC SYNTAX ################################################



            # Plain text should go through the template parser untouched
@@ -1349,27 +1350,34 @@ class Templates(unittest.TestCase): 
            ### SSI TAG ########################################################



            # Test normal behavior

            'old-ssi01': ('{%% ssi %s %%}' % os.path.join(os.path.dirname(os.path.abspath(__file__)), 'templates', 'ssi_include.html'), {}, 'This is for testing an ssi include. {{ test }}\n'),

            'old-ssi02': ('{%% ssi %s %%}' % os.path.join(os.path.dirname(os.path.abspath(__file__)), 'not_here'), {}, ''),

            'old-ssi01': ('{%% ssi %s %%}' % os.path.join(basedir, 'templates', 'ssi_include.html'), {}, 'This is for testing an ssi include. {{ test }}\n'),

            'old-ssi02': ('{%% ssi %s %%}' % os.path.join(basedir, 'not_here'), {}, ''),



            # Test parsed output

            'old-ssi06': ('{%% ssi %s parsed %%}' % os.path.join(os.path.dirname(os.path.abspath(__file__)), 'templates', 'ssi_include.html'), {'test': 'Look ma! It parsed!'}, 'This is for testing an ssi include. Look ma! It parsed!\n'),

            'old-ssi07': ('{%% ssi %s parsed %%}' % os.path.join(os.path.dirname(os.path.abspath(__file__)), 'not_here'), {'test': 'Look ma! It parsed!'}, ''),

            'old-ssi06': ('{%% ssi %s parsed %%}' % os.path.join(basedir, 'templates', 'ssi_include.html'), {'test': 'Look ma! It parsed!'}, 'This is for testing an ssi include. Look ma! It parsed!\n'),

            'old-ssi07': ('{%% ssi %s parsed %%}' % os.path.join(basedir, 'not_here'), {'test': 'Look ma! It parsed!'}, ''),



            # Test space in file name

            'old-ssi08': ('{%% ssi %s %%}' % os.path.join(basedir, 'templates', 'ssi include with spaces.html'), {}, template.TemplateSyntaxError),

            'old-ssi09': ('{%% ssi %s parsed %%}' % os.path.join(basedir, 'templates', 'ssi include with spaces.html'), {'test': 'Look ma! It parsed!'}, template.TemplateSyntaxError),



            # Future compatibility

            # Test normal behavior

            'ssi01': ('{%% load ssi from future %%}{%% ssi "%s" %%}' % os.path.join(os.path.dirname(os.path.abspath(__file__)), 'templates', 'ssi_include.html'), {}, 'This is for testing an ssi include. {{ test }}\n'),

            'ssi02': ('{%% load ssi from future %%}{%% ssi "%s" %%}' % os.path.join(os.path.dirname(os.path.abspath(__file__)), 'not_here'), {}, ''),

            'ssi03': ("{%% load ssi from future %%}{%% ssi '%s' %%}" % os.path.join(os.path.dirname(os.path.abspath(__file__)), 'not_here'), {}, ''),

            'ssi01': ('{%% load ssi from future %%}{%% ssi "%s" %%}' % os.path.join(basedir, 'templates', 'ssi_include.html'), {}, 'This is for testing an ssi include. {{ test }}\n'),

            'ssi02': ('{%% load ssi from future %%}{%% ssi "%s" %%}' % os.path.join(basedir, 'not_here'), {}, ''),

            'ssi03': ("{%% load ssi from future %%}{%% ssi '%s' %%}" % os.path.join(basedir, 'not_here'), {}, ''),



            # Test passing as a variable

            'ssi04': ('{% load ssi from future %}{% ssi ssi_file %}', {'ssi_file': os.path.join(os.path.dirname(os.path.abspath(__file__)), 'templates', 'ssi_include.html')}, 'This is for testing an ssi include. {{ test }}\n'),

            'ssi04': ('{% load ssi from future %}{% ssi ssi_file %}', {'ssi_file': os.path.join(basedir, 'templates', 'ssi_include.html')}, 'This is for testing an ssi include. {{ test }}\n'),

            'ssi05': ('{% load ssi from future %}{% ssi ssi_file %}', {'ssi_file': 'no_file'}, ''),



            # Test parsed output

            'ssi06': ('{%% load ssi from future %%}{%% ssi "%s" parsed %%}' % os.path.join(os.path.dirname(os.path.abspath(__file__)), 'templates', 'ssi_include.html'), {'test': 'Look ma! It parsed!'}, 'This is for testing an ssi include. Look ma! It parsed!\n'),

            'ssi07': ('{%% load ssi from future %%}{%% ssi "%s" parsed %%}' % os.path.join(os.path.dirname(os.path.abspath(__file__)), 'not_here'), {'test': 'Look ma! It parsed!'}, ''),

            'ssi06': ('{%% load ssi from future %%}{%% ssi "%s" parsed %%}' % os.path.join(basedir, 'templates', 'ssi_include.html'), {'test': 'Look ma! It parsed!'}, 'This is for testing an ssi include. Look ma! It parsed!\n'),

            'ssi07': ('{%% load ssi from future %%}{%% ssi "%s" parsed %%}' % os.path.join(basedir, 'not_here'), {'test': 'Look ma! It parsed!'}, ''),



            # Test space in file name

            'ssi08': ('{%% load ssi from future %%}{%% ssi "%s" %%}' % os.path.join(basedir, 'templates', 'ssi include with spaces.html'), {}, 'This is for testing an ssi include with spaces in its name. {{ test }}\n'),

            'ssi09': ('{%% load ssi from future %%}{%% ssi "%s" parsed %%}' % os.path.join(basedir, 'templates', 'ssi include with spaces.html'), {'test': 'Look ma! It parsed!'}, 'This is for testing an ssi include with spaces in its name. Look ma! It parsed!\n'),



            ### TEMPLATETAG TAG #######################################################

            'templatetag01': ('{% templatetag openblock %}', {}, '{%'),
@@ -1601,6 +1609,16 @@ class Templates(unittest.TestCase): 
            'static-prefixtag03': ('{% load static %}{% get_media_prefix %}', {}, settings.MEDIA_URL),

            'static-prefixtag04': ('{% load static %}{% get_media_prefix as media_prefix %}{{ media_prefix }}', {}, settings.MEDIA_URL),

        }

        # Until Django 1.5, the ssi tag takes an unquoted constant in argument,

        # and there's no way to escape spaces. As a consequence it's impossible

        # to include a file if its absolute path contains a space, as

        # demonstrated by tests old-ssi08 and old-ssi09.

        # If the patch to the Django chekout contains a space, the following

        # tests will raise an exception too.

        if ' ' in basedir:

            for test_name in 'old-ssi01', 'old-ssi02', 'old-ssi06', 'old-ssi07':

                tests[test_name] = tests[test_name][:-1] + (template.TemplateSyntaxError,)

        return tests



class TemplateTagLoading(unittest.TestCase):