p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #10387: removed some code duplication in django.utils.cache. Thanks, Travis Swicegood. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jacob Kaplan-Moss 2009-03-30 22:37:59 +00:00
parent 8eca2df3a4
commit 657eefbf25
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/utils/cache.py
View File

@ -146,6 +146,11 @@ def _generate_cache_key(request, headerlist, key_prefix):
return 'views.decorators.cache.cache_page.%s.%s.%s' % ( return 'views.decorators.cache.cache_page.%s.%s.%s' % (
key_prefix, iri_to_uri(request.path), ctx.hexdigest()) key_prefix, iri_to_uri(request.path), ctx.hexdigest())
def _generate_cache_header_key(key_prefix, request):
"""Returns a cache key for the header cache."""
return 'views.decorators.cache.cache_header.%s.%s' % (
key_prefix, iri_to_uri(request.path))
def get_cache_key(request, key_prefix=None): def get_cache_key(request, key_prefix=None):
""" """
Returns a cache key based on the request path. It can be used in the Returns a cache key based on the request path. It can be used in the
@ -158,8 +163,7 @@ def get_cache_key(request, key_prefix=None):
""" """
if key_prefix is None: if key_prefix is None:
key_prefix = settings.CACHE_MIDDLEWARE_KEY_PREFIX key_prefix = settings.CACHE_MIDDLEWARE_KEY_PREFIX
cache_key = 'views.decorators.cache.cache_header.%s.%s' % ( cache_key = _generate_cache_header_key(key_prefix, request)
key_prefix, iri_to_uri(request.path))
headerlist = cache.get(cache_key, None) headerlist = cache.get(cache_key, None)
if headerlist is not None: if headerlist is not None:
return _generate_cache_key(request, headerlist, key_prefix) return _generate_cache_key(request, headerlist, key_prefix)
@ -183,8 +187,7 @@ def learn_cache_key(request, response, cache_timeout=None, key_prefix=None):
key_prefix = settings.CACHE_MIDDLEWARE_KEY_PREFIX key_prefix = settings.CACHE_MIDDLEWARE_KEY_PREFIX
if cache_timeout is None: if cache_timeout is None:
cache_timeout = settings.CACHE_MIDDLEWARE_SECONDS cache_timeout = settings.CACHE_MIDDLEWARE_SECONDS
cache_key = 'views.decorators.cache.cache_header.%s.%s' % ( cache_key = _generate_cache_header_key(key_prefix, request)
key_prefix, iri_to_uri(request.path))
if response.has_header('Vary'): if response.has_header('Vary'):
headerlist = ['HTTP_'+header.upper().replace('-', '_') headerlist = ['HTTP_'+header.upper().replace('-', '_')
for header in cc_delim_re.split(response['Vary'])] for header in cc_delim_re.split(response['Vary'])]