Django

Code

Changeset 9532

Show
Ignore:
Timestamp:
11/24/08 16:33:32 (2 months ago)
Author:
jacob
Message:

Here's the rest of [9530] where I actually rename the tag like I said I did. I swear this was git's fault, not mine.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/template/defaulttags.py

    r9530 r9532  
    680680 
    681681    sequence = parser.compile_filter(bits[in_index+1]) 
    682     nodelist_loop = parser.parse(('default', 'endfor',)) 
     682    nodelist_loop = parser.parse(('empty', 'endfor',)) 
    683683    token = parser.next_token() 
    684     if token.contents == 'default': 
    685         nodelist_default = parser.parse(('endfor',)) 
     684    if token.contents == 'empty': 
     685        nodelist_empty = parser.parse(('endfor',)) 
    686686        parser.delete_first_token() 
    687687    else: 
    688         nodelist_default = None 
    689     return ForNode(loopvars, sequence, is_reversed, nodelist_loop, nodelist_default) 
     688        nodelist_empty = None 
     689    return ForNode(loopvars, sequence, is_reversed, nodelist_loop, nodelist_empty) 
    690690do_for = register.tag("for", do_for) 
    691691 

  • django/trunk/tests/regressiontests/templates/tests.py

    r9530 r9532  
    485485            'for-tag-unpack12': ("{% for x,y,z in items %}{{ x }}:{{ y }},{{ z }}/{% endfor %}", {"items": (('one', 1, 'carrot'), ('two', 2))}, ("one:1,carrot/two:2,/", "one:1,carrot/two:2,INVALID/")), 
    486486            'for-tag-unpack13': ("{% for x,y,z in items %}{{ x }}:{{ y }},{{ z }}/{% endfor %}", {"items": (('one', 1, 'carrot'), ('two', 2, 'cheese'))}, ("one:1,carrot/two:2,cheese/", "one:1,carrot/two:2,cheese/")), 
    487             'for-tag-default01': ("{% for val in values %}{{ val }}{% default %}default text{% endfor %}", {"values": [1, 2, 3]}, "123"), 
    488             'for-tag-default02': ("{% for val in values %}{{ val }}{% default %}values array empty{% endfor %}", {"values": []}, "values array empty"), 
    489             'for-tag-default03': ("{% for val in values %}{{ val }}{% default %}values array not found{% endfor %}", {}, "values array not found"), 
     487            'for-tag-empty01': ("{% for val in values %}{{ val }}{% empty %}empty text{% endfor %}", {"values": [1, 2, 3]}, "123"), 
     488            'for-tag-empty02': ("{% for val in values %}{{ val }}{% empty %}values array empty{% endfor %}", {"values": []}, "values array empty"), 
     489            'for-tag-empty03': ("{% for val in values %}{{ val }}{% empty %}values array not found{% endfor %}", {}, "values array not found"), 
    490490 
    491491            ### IF TAG ################################################################