From 40b9f4fb8bc9140876be7ab539c30e613a8898ee Mon Sep 17 00:00:00 2001 From: Ɓukasz Langa Date: Wed, 27 Feb 2013 04:26:15 +0100 Subject: [py3] Always fed hashlib with bytes. --- tests/cache/tests.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'tests/cache') 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 ) -- cgit v1.3