Commit 31ffb1b9 authored by Ian Lee's avatar Ian Lee Committed by Tim Graham
Browse files

[1.7.x] Broke long lines in code examples. 

The website only renders code blocks at 96 chars, and therefore
long code lines get wrapped. Manually breaking the lines prevents
the wrapping from occurring.

Backport of 00fbd8fd from master
parent 61705f00

docs/howto/custom-template-tags.txt

+18 −6
Original line number Diff line number Diff line
@@ -442,9 +442,13 @@ 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:
@@ -717,9 +721,13 @@ 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
@@ -1077,13 +1085,17 @@ 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)

        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