Permalink
Browse files

[py3] Fixed conditional_processing tests

  • Loading branch information...
1 parent 0120985 commit 928baee7478f2e1bd48fb8e0801f4f1ffc4f7aea @claudep claudep committed Aug 14, 2012
Showing with 4 additions and 2 deletions.
  1. +3 −1 django/utils/http.py
  2. +1 −1 tests/regressiontests/conditional_processing/models.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
import calendar
import datetime
import re
@@ -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):
@@ -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:

0 comments on commit 928baee

Please sign in to comment.