Django

Code

Changeset 6976

Show
Ignore:
Timestamp:
12/22/07 13:38:48 (1 year ago)
Author:
adrian
Message:

Renamed 'reversed' variable to 'is_reversed' in ForLoop? template tag implementation, to avoid potential conflicts with the 'reversed' built-in and to make the code more obvious

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r6956 r6976  
    8585 
    8686class ForNode(Node): 
    87     def __init__(self, loopvars, sequence, reversed, nodelist_loop): 
     87    def __init__(self, loopvars, sequence, is_reversed, nodelist_loop): 
    8888        self.loopvars, self.sequence = loopvars, sequence 
    89         self.reversed = reversed 
     89        self.is_reversed = is_reversed 
    9090        self.nodelist_loop = nodelist_loop 
    9191 
    9292    def __repr__(self): 
    93         if self.reversed: 
    94             reversed = ' reversed' 
    95         else: 
    96             reversed = '' 
     93        reversed_text = self.is_reversed and ' reversed' or '' 
    9794        return "<For Node: for %s in %s, tail_len: %d%s>" % \ 
    9895            (', '.join(self.loopvars), self.sequence, len(self.nodelist_loop), 
    99              reversed) 
     96             reversed_text) 
    10097 
    10198    def __iter__(self): 
    …… 
    126123            values = list(values) 
    127124        len_values = len(values) 
    128         if self.reversed: 
     125        if self.is_reversed: 
    129126            values = reversed(values) 
    130127        unpack = len(self.loopvars) > 1 
    …… 
    620617                                  " words: %s" % token.contents) 
    621618 
    622     reversed = bits[-1] == 'reversed' 
    623     in_index = reversed and -3 or -2 
     619    is_reversed = bits[-1] == 'reversed' 
     620    in_index = is_reversed and -3 or -2 
    624621    if bits[in_index] != 'in': 
    625622        raise TemplateSyntaxError("'for' statements should use the format" 
    …… 
    635632    nodelist_loop = parser.parse(('endfor',)) 
    636633    parser.delete_first_token() 
    637     return ForNode(loopvars, sequence, reversed, nodelist_loop) 
     634    return ForNode(loopvars, sequence, is_reversed, nodelist_loop) 
    638635do_for = register.tag("for", do_for) 
    639636