|
@@ -351,9 +351,9 @@ object::
|
|
|
# split_contents() knows not to split quoted strings.
|
|
|
tag_name, format_string = token.split_contents()
|
|
|
except ValueError:
|
|
|
- raise template.TemplateSyntaxError, "%r tag requires a single argument" % token.contents.split()[0]
|
|
|
+ raise template.TemplateSyntaxError("%r tag requires a single argument" % token.contents.split()[0])
|
|
|
if not (format_string[0] == format_string[-1] and format_string[0] in ('"', "'")):
|
|
|
- raise template.TemplateSyntaxError, "%r tag's argument should be in quotes" % tag_name
|
|
|
+ raise template.TemplateSyntaxError("%r tag's argument should be in quotes" % tag_name)
|
|
|
return CurrentTimeNode(format_string[1:-1])
|
|
|
|
|
|
Notes:
|
|
@@ -596,9 +596,9 @@ Now your tag should begin to look like this::
|
|
|
# split_contents() knows not to split quoted strings.
|
|
|
tag_name, date_to_be_formatted, format_string = token.split_contents()
|
|
|
except ValueError:
|
|
|
- raise template.TemplateSyntaxError, "%r tag requires exactly two arguments" % token.contents.split()[0]
|
|
|
+ raise template.TemplateSyntaxError("%r tag requires exactly two arguments" % token.contents.split()[0])
|
|
|
if not (format_string[0] == format_string[-1] and format_string[0] in ('"', "'")):
|
|
|
- raise template.TemplateSyntaxError, "%r tag's argument should be in quotes" % tag_name
|
|
|
+ raise template.TemplateSyntaxError("%r tag's argument should be in quotes" % tag_name)
|
|
|
return FormatTimeNode(date_to_be_formatted, format_string[1:-1])
|
|
|
|
|
|
You also have to change the renderer to retrieve the actual contents of the
|
|
@@ -863,13 +863,13 @@ class, like so::
|
|
|
# Splitting by None == splitting by spaces.
|
|
|
tag_name, arg = token.contents.split(None, 1)
|
|
|
except ValueError:
|
|
|
- raise template.TemplateSyntaxError, "%r tag requires arguments" % token.contents.split()[0]
|
|
|
+ raise template.TemplateSyntaxError("%r tag requires arguments" % token.contents.split()[0])
|
|
|
m = re.search(r'(.*?) as (\w+)', arg)
|
|
|
if not m:
|
|
|
- raise template.TemplateSyntaxError, "%r tag had invalid arguments" % tag_name
|
|
|
+ raise template.TemplateSyntaxError("%r tag had invalid arguments" % tag_name)
|
|
|
format_string, var_name = m.groups()
|
|
|
if not (format_string[0] == format_string[-1] and format_string[0] in ('"', "'")):
|
|
|
- raise template.TemplateSyntaxError, "%r tag's argument should be in quotes" % tag_name
|
|
|
+ raise template.TemplateSyntaxError("%r tag's argument should be in quotes" % tag_name)
|
|
|
return CurrentTimeNode3(format_string[1:-1], var_name)
|
|
|
|
|
|
The difference here is that ``do_current_time()`` grabs the format string and
|