Fixed #16939 -- Inaccurate implementation of {% comment %} presented in custom template tag 'howto' guide. Thanks sebastian for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
ad97f0ec4b
commit
5ccc6f17b8
|
@ -1155,7 +1155,7 @@ Template tags can work in tandem. For instance, the standard
|
||||||
To create a template tag such as this, use ``parser.parse()`` in your
|
To create a template tag such as this, use ``parser.parse()`` in your
|
||||||
compilation function.
|
compilation function.
|
||||||
|
|
||||||
Here's how the standard :ttag:`{% comment %}<comment>` tag is implemented:
|
Here's how a simplified ``{% comment %}`` tag might be implemented:
|
||||||
|
|
||||||
.. code-block:: python
|
.. code-block:: python
|
||||||
|
|
||||||
|
@ -1168,6 +1168,14 @@ Here's how the standard :ttag:`{% comment %}<comment>` tag is implemented:
|
||||||
def render(self, context):
|
def render(self, context):
|
||||||
return ''
|
return ''
|
||||||
|
|
||||||
|
.. note::
|
||||||
|
The actual implementation of :ttag:`{% comment %}<comment>` is slightly
|
||||||
|
different in that it allows broken template tags to appear between
|
||||||
|
``{% comment %}`` and ``{% endcomment %}``. It does so by calling
|
||||||
|
``parser.skip_past('endcomment')`` instead of ``parser.parse(('endcomment',))``
|
||||||
|
followed by ``parser.delete_first_token()``, thus avoiding the generation of a
|
||||||
|
node list.
|
||||||
|
|
||||||
``parser.parse()`` takes a tuple of names of block tags ''to parse until''. It
|
``parser.parse()`` takes a tuple of names of block tags ''to parse until''. It
|
||||||
returns an instance of ``django.template.NodeList``, which is a list of
|
returns an instance of ``django.template.NodeList``, which is a list of
|
||||||
all ``Node`` objects that the parser encountered ''before'' it encountered
|
all ``Node`` objects that the parser encountered ''before'' it encountered
|
||||||
|
|
|
@ -51,7 +51,7 @@ Defines a block that can be overridden by child templates. See
|
||||||
comment
|
comment
|
||||||
^^^^^^^
|
^^^^^^^
|
||||||
|
|
||||||
Ignores everything between ``{% comment %}`` and ``{% endcomment %}``
|
Ignores everything between ``{% comment %}`` and ``{% endcomment %}``.
|
||||||
|
|
||||||
.. templatetag:: csrf_token
|
.. templatetag:: csrf_token
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue