Loading django/utils/http.py +3 −1 Original line number Diff line number Diff line from __future__ import unicode_literals import calendar import datetime import re Loading Loading @@ -211,7 +213,7 @@ def parse_etags(etag_str): if not etags: # etag_str has wrong format, treat it as an opaque string then return [etag_str] etags = [e.decode('string_escape') for e in etags] etags = [e.encode('ascii').decode('unicode_escape') for e in etags] return etags def quote_etag(etag): Loading tests/regressiontests/conditional_processing/models.py +1 −1 Original line number Diff line number Diff line Loading @@ -22,7 +22,7 @@ class ConditionalGet(TestCase): def assertFullResponse(self, response, check_last_modified=True, check_etag=True): self.assertEqual(response.status_code, 200) self.assertEqual(response.content, FULL_RESPONSE) self.assertEqual(response.content, FULL_RESPONSE.encode()) if check_last_modified: self.assertEqual(response['Last-Modified'], LAST_MODIFIED_STR) if check_etag: Loading Loading
django/utils/http.py +3 −1 Original line number Diff line number Diff line from __future__ import unicode_literals import calendar import datetime import re Loading Loading @@ -211,7 +213,7 @@ def parse_etags(etag_str): if not etags: # etag_str has wrong format, treat it as an opaque string then return [etag_str] etags = [e.decode('string_escape') for e in etags] etags = [e.encode('ascii').decode('unicode_escape') for e in etags] return etags def quote_etag(etag): Loading
tests/regressiontests/conditional_processing/models.py +1 −1 Original line number Diff line number Diff line Loading @@ -22,7 +22,7 @@ class ConditionalGet(TestCase): def assertFullResponse(self, response, check_last_modified=True, check_etag=True): self.assertEqual(response.status_code, 200) self.assertEqual(response.content, FULL_RESPONSE) self.assertEqual(response.content, FULL_RESPONSE.encode()) if check_last_modified: self.assertEqual(response['Last-Modified'], LAST_MODIFIED_STR) if check_etag: Loading