Django

Code

Changeset 3938

Show
Ignore:
Timestamp:
10/26/06 20:58:13 (2 years ago)
Author:
adrian
Message:

Fixed #2961 -- Added 'opencomment' and 'closecomment' options to {% templatetag %} templatetag. Thanks for the patch, Jeong-Min Lee

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/AUTHORS

    r3931 r3938  
    107107    Stuart Langridge <http://www.kryogenix.org/> 
    108108    Eugene Lazutkin <http://lazutkin.com/blog/> 
    109     Jeong-Min Lee 
     109    Jeong-Min Lee <falsetru@gmail.com> 
    110110    Christopher Lenz <http://www.cmlenz.net/> 
    111111    lerouxb@gmail.com 
  • django/trunk/django/template/defaulttags.py

    r3800 r3938  
    22 
    33from django.template import Node, NodeList, Template, Context, resolve_variable 
    4 from django.template import TemplateSyntaxError, VariableDoesNotExist, BLOCK_TAG_START, BLOCK_TAG_END, VARIABLE_TAG_START, VARIABLE_TAG_END, SINGLE_BRACE_START, SINGLE_BRACE_END 
     4from django.template import TemplateSyntaxError, VariableDoesNotExist, BLOCK_TAG_START, BLOCK_TAG_END, VARIABLE_TAG_START, VARIABLE_TAG_END, SINGLE_BRACE_START, SINGLE_BRACE_END, COMMENT_TAG_START, COMMENT_TAG_END 
    55from django.template import get_library, Library, InvalidTemplateLibrary 
    66from django.conf import settings 
     
    296296               'openbrace': SINGLE_BRACE_START, 
    297297               'closebrace': SINGLE_BRACE_END, 
     298               'opencomment': COMMENT_TAG_START, 
     299               'closecomment': COMMENT_TAG_END, 
    298300               } 
    299301 
     
    832834        ``openbrace``       ``{`` 
    833835        ``closebrace``      ``}`` 
     836        ``opencomment``     ``{#`` 
     837        ``closecomment``    ``#}`` 
    834838        ==================  ======= 
    835839    """ 
  • django/trunk/docs/templates.txt

    r3931 r3938  
    801801    ``openbrace``       ``{`` 
    802802    ``closebrace``      ``}`` 
     803    ``opencomment``     ``{#`` 
     804    ``closecomment``    ``#}`` 
    803805    ==================  ======= 
     806 
     807Note: ``opencomment`` and ``closecomment`` are new in the Django development version. 
    804808 
    805809widthratio 
  • django/trunk/tests/regressiontests/templates/tests.py

    r3931 r3938  
    553553            'templatetag09': ('{% templatetag openbrace %}{% templatetag openbrace %}', {}, '{{'), 
    554554            'templatetag10': ('{% templatetag closebrace %}{% templatetag closebrace %}', {}, '}}'), 
     555            'templatetag11': ('{% templatetag opencomment %}', {}, '{#'), 
     556            'templatetag12': ('{% templatetag closecomment %}', {}, '#}'), 
    555557 
    556558            ### WIDTHRATIO TAG ########################################################