summaryrefslogtreecommitdiff
path: root/django/utils/http.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-08-14 21:17:25 +0200
committerClaude Paroz <claude@2xlibre.net>2012-08-14 23:35:12 +0200
commit928baee7478f2e1bd48fb8e0801f4f1ffc4f7aea (patch)
treee134df66ea22b6062989a7a4f904a852646e98de /django/utils/http.py
parent0120985095ad6fd59be111bb9a3927ee04b426e8 (diff)
[py3] Fixed conditional_processing tests
Diffstat (limited to 'django/utils/http.py')
-rw-r--r--django/utils/http.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/utils/http.py b/django/utils/http.py
index 22e81a33d7..cdd56bfed1 100644
--- a/django/utils/http.py
+++ b/django/utils/http.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):