Commit 6ae393d7 authored by Julien Phalip's avatar Julien Phalip
Browse files

Fixed #15092 -- Made `{% now %}` work with single-quoted string arguments.... 

Fixed #15092 -- Made `{% now %}` work with single-quoted string arguments. Thanks to ninja_otoko for the report and to steveire, Aymeric Augustin and Claude Paroz for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 804bd403

django/template/defaulttags.py

+3 −3
Original line number Diff line number Diff line
@@ -1049,10 +1049,10 @@ def now(parser, token): 


        It is {% now "jS F Y H:i" %}

    """

    bits = token.contents.split('"')

    if len(bits) != 3:

    bits = token.split_contents()

    if len(bits) != 2:

        raise TemplateSyntaxError("'now' statement takes one argument")

    format_string = bits[1]

    format_string = bits[1][1:-1]

    return NowNode(format_string)



@register.tag

tests/regressiontests/templates/tests.py

+11 −7
Original line number Diff line number Diff line
@@ -1462,14 +1462,18 @@ class Templates(unittest.TestCase): 


            ### NOW TAG ########################################################

            # Simple case

            'now01': ('{% now "j n Y"%}', {}, str(datetime.now().day) + ' ' + str(datetime.now().month) + ' ' + str(datetime.now().year)),



            # Check parsing of escaped and special characters

            'now02': ('{% now "j "n" Y"%}', {}, template.TemplateSyntaxError),

        #    'now03': ('{% now "j \"n\" Y"%}', {}, str(datetime.now().day) + '"' + str(datetime.now().month) + '"' + str(datetime.now().year)),

        #    'now04': ('{% now "j \nn\n Y"%}', {}, str(datetime.now().day) + '\n' + str(datetime.now().month) + '\n' + str(datetime.now().year))

            'now01': ('{% now "j n Y" %}', {}, "%d %d %d" % (

                datetime.now().day, datetime.now().month, datetime.now().year)),

            # Check parsing of locale strings

            'now05': ('{% now "DATE_FORMAT" %}', {},  date_format(datetime.now())),

            'now02': ('{% now "DATE_FORMAT" %}', {},  date_format(datetime.now())),

            # Also accept simple quotes - #15092

            'now03': ("{% now 'j n Y' %}", {}, "%d %d %d" % (

                datetime.now().day, datetime.now().month, datetime.now().year)),

            'now04': ("{% now 'DATE_FORMAT' %}", {},  date_format(datetime.now())),

            'now05': ('''{% now 'j "n" Y'%}''', {}, '''%d "%d" %d''' % (

                datetime.now().day, datetime.now().month, datetime.now().year)),

            'now06': ('''{% now "j 'n' Y"%}''', {}, '''%d '%d' %d''' % (

                datetime.now().day, datetime.now().month, datetime.now().year)),



            ### URL TAG ########################################################

            # Successes