mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 15:16:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #5691 - Adds the active language to the cache key. Thanks, Antoni Aloy, Ramiro Morales and Yann Malet.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12546 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel
2010-02-23 20:45:28 +00:00
parent 6ba5fb3728
commit 2164e138e3
4 changed files with 121 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
django/utils/cache.py
View File

@@ -19,16 +19,13 @@ An example: i18n middleware would need to distinguish caches by the
import re
import time
try:
set
except NameError:
from sets import Set as set # Python 2.3 fallback
from django.conf import settings
from django.core.cache import cache
from django.utils.encoding import smart_str, iri_to_uri
from django.utils.http import http_date
from django.utils.hashcompat import md5_constructor
from django.utils import translation
from django.http import HttpRequest
cc_delim_re = re.compile(r'\s*,\s*')
@@ -145,13 +142,20 @@ def _generate_cache_key(request, headerlist, key_prefix):
if value is not None:
ctx.update(value)
path = md5_constructor(iri_to_uri(request.path))
return 'views.decorators.cache.cache_page.%s.%s.%s' % (
key_prefix, path.hexdigest(), ctx.hexdigest())
cache_key = 'views.decorators.cache.cache_page.%s.%s.%s' % (
key_prefix, path.hexdigest(), ctx.hexdigest())
if settings.USE_I18N:
cache_key += '.%s' % translation.get_language()
return cache_key
def _generate_cache_header_key(key_prefix, request):
"""Returns a cache key for the header cache."""
path = md5_constructor(iri_to_uri(request.path))
return 'views.decorators.cache.cache_header.%s.%s' % (key_prefix, path.hexdigest())
cache_key = 'views.decorators.cache.cache_header.%s.%s' % (
key_prefix, path.hexdigest())
if settings.USE_I18N:
cache_key += ".%s" % translation.get_language()
return cache_key
def get_cache_key(request, key_prefix=None):
"""