[py3] Made a small fix in django.http.

This is necessary for the 'utils' tests to pass.
bak1an · Aug 7, 2012 · bf4da7a · bf4da7a
1 parent 9e0a10b
commit bf4da7a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/django/http/__init__.py b/django/http/__init__.py
@@ -549,7 +549,12 @@ def _convert_to_ascii(self, *values):
         for value in values:
             if isinstance(value, six.text_type):
                 try:
-                    value = value.encode('us-ascii')
+                    if not six.PY3:
+                        value = value.encode('us-ascii')
+                    else:
+                        # In Python 3, use a string in headers,
+                        # but ensure in only contains ASCII characters.
+                        value.encode('us-ascii')
                 except UnicodeError as e:
                     e.reason += ', HTTP response headers must be in US-ASCII format'
                     raise