Django

Code

Changeset 6626

Show
Ignore:
Timestamp:
10/28/07 17:32:25 (1 year ago)
Author:
gwilson
Message:

Corrected a typo and made some style fixes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/utils/cache.py

    r6435 r6626  
    1414cache keys to prevent delivery of wrong content. 
    1515 
    16 A example: i18n middleware would need to distinguish caches by the 
     16An example: i18n middleware would need to distinguish caches by the 
    1717"Accept-language" header. 
    1818""" 
    …… 
    2222import time 
    2323from email.Utils import formatdate 
     24 
    2425from django.conf import settings 
    2526from django.core.cache import cache 
    …… 
    4142    """ 
    4243    def dictitem(s): 
    43         t = s.split('=',1) 
     44        t = s.split('=', 1) 
    4445        if len(t) > 1: 
    4546            return (t[0].lower(), t[1]) 
    …… 
    6566        kwargs['max_age'] = min(cc['max-age'], kwargs['max_age']) 
    6667 
    67     for (k,v) in kwargs.items(): 
     68    for (k, v) in kwargs.items(): 
    6869        cc[k.replace('_', '-')] = v 
    6970    cc = ', '.join([dictvalue(el) for el in cc.items()]) 
    …… 
    9697def add_never_cache_headers(response): 
    9798    """ 
    98     Add headers to a response to indicate that 
    99     a page should never be cached. 
     99    Adds headers to a response to indicate that a page should never be cached. 
    100100    """ 
    101101    patch_response_headers(response, cache_timeout=-1) 
    …… 
    120120 
    121121def _generate_cache_key(request, headerlist, key_prefix): 
    122     "Returns a cache key from the headers given in the header list." 
     122    """Returns a cache key from the headers given in the header list.""" 
    123123    ctx = md5.new() 
    124124    for header in headerlist: 
    …… 
    126126        if value is not None: 
    127127            ctx.update(value) 
    128     return 'views.decorators.cache.cache_page.%s.%s.%s' % (key_prefix, iri_to_uri(request.path), ctx.hexdigest()) 
     128    return 'views.decorators.cache.cache_page.%s.%s.%s' % ( 
     129               key_prefix, iri_to_uri(request.path), ctx.hexdigest()) 
    129130 
    130131def get_cache_key(request, key_prefix=None): 
    …… 
    140141    if key_prefix is None: 
    141142        key_prefix = settings.CACHE_MIDDLEWARE_KEY_PREFIX 
    142     cache_key = 'views.decorators.cache.cache_header.%s.%s' % (key_prefix, iri_to_uri(request.path)) 
     143    cache_key = 'views.decorators.cache.cache_header.%s.%s' % ( 
     144                    key_prefix, iri_to_uri(request.path)) 
    143145    headerlist = cache.get(cache_key, None) 
    144146    if headerlist is not None: 
    …… 
    164166    if cache_timeout is None: 
    165167        cache_timeout = settings.CACHE_MIDDLEWARE_SECONDS 
    166     cache_key = 'views.decorators.cache.cache_header.%s.%s' % (key_prefix, iri_to_uri(request.path)) 
     168    cache_key = 'views.decorators.cache.cache_header.%s.%s' % ( 
     169                    key_prefix, iri_to_uri(request.path)) 
    167170    if response.has_header('Vary'): 
    168         headerlist = ['HTTP_'+header.upper().replace('-', '_') for header in vary_delim_re.split(response['Vary'])] 
     171        headerlist = ['HTTP_'+header.upper().replace('-', '_') 
     172                      for header in vary_delim_re.split(response['Vary'])] 
    169173        cache.set(cache_key, headerlist, cache_timeout) 
    170174        return _generate_cache_key(request, headerlist, key_prefix)