p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Julien Phalip 2012-01-24 08:02:34 +00:00
parent 804bd40383
commit 6ae393d74d
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/template/defaulttags.py
View File

@ -1049,10 +1049,10 @@ def now(parser, token):
It is {% now "jS F Y H:i" %} It is {% now "jS F Y H:i" %}
""" """
bits = token.contents.split('"') bits = token.split_contents()
if len(bits) != 3: if len(bits) != 2:
raise TemplateSyntaxError("'now' statement takes one argument") raise TemplateSyntaxError("'now' statement takes one argument")
format_string = bits[1] format_string = bits[1][1:-1]
return NowNode(format_string) return NowNode(format_string)
@register.tag @register.tag

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

@ -1462,14 +1462,18 @@ class Templates(unittest.TestCase):
### NOW TAG ######################################################## ### NOW TAG ########################################################
# Simple case # Simple case
'now01': ('{% now "j n Y"%}', {}, str(datetime.now().day) + ' ' + str(datetime.now().month) + ' ' + str(datetime.now().year)), 'now01': ('{% now "j n Y" %}', {}, "%d %d %d" % (
datetime.now().day, datetime.now().month, 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))
# Check parsing of locale strings # 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 ######################################################## ### URL TAG ########################################################
# Successes # Successes