summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorƁukasz Langa <lukasz@langa.pl>2013-02-27 04:26:15 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-02-27 10:02:07 +0100
commit40b9f4fb8bc9140876be7ab539c30e613a8898ee (patch)
tree7f160f7a229e41a1d7c668eb96d12f632140ffbf /tests
parenta28e2e7c4d84a94ad8c243cbca53786bd7e60971 (diff)
[py3] Always fed hashlib with bytes.
Diffstat (limited to 'tests')
-rw-r--r--tests/cache/tests.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/cache/tests.py b/tests/cache/tests.py
index c1b68ec809..00c51638b7 100644
--- a/tests/cache/tests.py
+++ b/tests/cache/tests.py
@@ -1327,7 +1327,7 @@ class CacheI18nTest(TestCase):
def check_accept_language_vary(self, accept_language, vary, reference_key):
request = self._get_request()
request.META['HTTP_ACCEPT_LANGUAGE'] = accept_language
- request.META['HTTP_ACCEPT_ENCODING'] = b'gzip;q=1.0, identity; q=0.5, *;q=0'
+ request.META['HTTP_ACCEPT_ENCODING'] = 'gzip;q=1.0, identity; q=0.5, *;q=0'
response = HttpResponse()
response['Vary'] = vary
key = learn_cache_key(request, response)
@@ -1340,53 +1340,53 @@ class CacheI18nTest(TestCase):
lang = translation.get_language()
self.assertEqual(lang, 'en')
request = self._get_request()
- request.META['HTTP_ACCEPT_ENCODING'] = b'gzip;q=1.0, identity; q=0.5, *;q=0'
+ request.META['HTTP_ACCEPT_ENCODING'] = 'gzip;q=1.0, identity; q=0.5, *;q=0'
response = HttpResponse()
response['Vary'] = 'accept-encoding'
key = learn_cache_key(request, response)
self.assertIn(lang, key, "Cache keys should include the language name when translation is active")
self.check_accept_language_vary(
- b'en-us',
+ 'en-us',
'cookie, accept-language, accept-encoding',
key
)
self.check_accept_language_vary(
- b'en-US',
+ 'en-US',
'cookie, accept-encoding, accept-language',
key
)
self.check_accept_language_vary(
- b'en-US,en;q=0.8',
+ 'en-US,en;q=0.8',
'accept-encoding, accept-language, cookie',
key
)
self.check_accept_language_vary(
- b'en-US,en;q=0.8,ko;q=0.6',
+ 'en-US,en;q=0.8,ko;q=0.6',
'accept-language, cookie, accept-encoding',
key
)
self.check_accept_language_vary(
- b'ko-kr,ko;q=0.8,en-us;q=0.5,en;q=0.3 ',
+ 'ko-kr,ko;q=0.8,en-us;q=0.5,en;q=0.3 ',
'accept-encoding, cookie, accept-language',
key
)
self.check_accept_language_vary(
- b'ko-KR,ko;q=0.8,en-US;q=0.6,en;q=0.4',
+ 'ko-KR,ko;q=0.8,en-US;q=0.6,en;q=0.4',
'accept-language, accept-encoding, cookie',
key
)
self.check_accept_language_vary(
- b'ko;q=1.0,en;q=0.5',
+ 'ko;q=1.0,en;q=0.5',
'cookie, accept-language, accept-encoding',
key
)
self.check_accept_language_vary(
- b'ko, en',
+ 'ko, en',
'cookie, accept-encoding, accept-language',
key
)
self.check_accept_language_vary(
- b'ko-KR, en-US',
+ 'ko-KR, en-US',
'accept-encoding, accept-language, cookie',
key
)