From 928baee7478f2e1bd48fb8e0801f4f1ffc4f7aea Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Tue, 14 Aug 2012 21:17:25 +0200
Subject: [py3] Fixed conditional_processing tests

---
 django/utils/http.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'django/utils')

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):
-- 
cgit v1.3