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

Fixed a CacheKeyWarning under Windows. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Aymeric Augustin 2011-12-27 08:22:55 +00:00
parent b045783729
commit e8a6fee6e6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/utils/cache.py
View File

@ -165,7 +165,9 @@ def _i18n_cache_key_suffix(request, cache_key):
# which in turn can also fall back to settings.LANGUAGE_CODE # which in turn can also fall back to settings.LANGUAGE_CODE
cache_key += '.%s' % getattr(request, 'LANGUAGE_CODE', get_language()) cache_key += '.%s' % getattr(request, 'LANGUAGE_CODE', get_language())
if settings.USE_TZ: if settings.USE_TZ:
cache_key += '.%s' % get_current_timezone_name() # Windows uses non-standard timezone names that may include spaces,
# which triggers CacheKeyWarning.
cache_key += '.%s' % get_current_timezone_name().replace(' ', '_')
return cache_key return cache_key
def _generate_cache_key(request, method, headerlist, key_prefix): def _generate_cache_key(request, method, headerlist, key_prefix):

4
tests/regressiontests/cache/tests.py vendored
View File

@ -1270,7 +1270,7 @@ class CacheI18nTest(TestCase):
@override_settings(USE_I18N=False, USE_L10N=False, USE_TZ=True) @override_settings(USE_I18N=False, USE_L10N=False, USE_TZ=True)
def test_cache_key_i18n_timezone(self): def test_cache_key_i18n_timezone(self):
request = self._get_request() request = self._get_request()
tz = timezone.get_current_timezone_name() tz = timezone.get_current_timezone_name().replace(' ', '_')
response = HttpResponse() response = HttpResponse()
key = learn_cache_key(request, response) key = learn_cache_key(request, response)
self.assertIn(tz, key, "Cache keys should include the time zone name when time zones are active") self.assertIn(tz, key, "Cache keys should include the time zone name when time zones are active")
@ -1281,7 +1281,7 @@ class CacheI18nTest(TestCase):
def test_cache_key_no_i18n (self): def test_cache_key_no_i18n (self):
request = self._get_request() request = self._get_request()
lang = translation.get_language() lang = translation.get_language()
tz = timezone.get_current_timezone_name() tz = timezone.get_current_timezone_name().replace(' ', '_')
response = HttpResponse() response = HttpResponse()
key = learn_cache_key(request, response) key = learn_cache_key(request, response)
self.assertNotIn(lang, key, "Cache keys shouldn't include the language name when i18n isn't active") self.assertNotIn(lang, key, "Cache keys shouldn't include the language name when i18n isn't active")