Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #15092 -- Made `{% now %}` work with single-quoted string argum…

…ents. 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
  • Loading branch information...
commit 6ae393d74db1f8e553c80951f3eaeb3ba16fc223 1 parent 804bd40
Julien Phalip jphalip authored
6 django/template/defaulttags.py
View
@@ -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
18 tests/regressiontests/templates/tests.py
View
@@ -1462,14 +1462,18 @@ def get_template_tests(self):
### 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
Please sign in to comment.
Something went wrong with that request. Please try again.