Ticket #8765: 8765.2.diff

tests/regressiontests/httpwrappers/tests.py

@@ -429 +429 @@
 ...
 UnicodeEncodeError: ..., HTTP response headers must be in US-ASCII format
 
+An error is raised when a unicode object with non-ascii is set as the initial
+mimetype or content_type.
+
+>>> HttpResponse(mimetype=u't\xebst value') # doctest:+ELLIPSIS
+Traceback (most recent call last):
+...
+UnicodeEncodeError: ..., HTTP response headers must be in US-ASCII format
+>>> HttpResponse(content_type=u't\xebst value') # doctest:+ELLIPSIS
+Traceback (most recent call last):
+...
+UnicodeEncodeError: ..., HTTP response headers must be in US-ASCII format
+
 The response also converts unicode keys to strings.
 
 >>> r[u'test'] = 'testing key'

django/http/__init__.py

@@ -272 +272 @@
     status_code = 200
 
     def __init__(self, content='', mimetype=None, status=None,
-            content_type=None):
-        from django.conf import settings
+                 content_type=None):
+        # _headers is a mapping of the lower-case name to the original case of
+        # the header (required for working with legacy systems) and the header
+        # value.  Both the name of the header and its value are ASCII strings.
+        self._headers = {}
         self._charset = settings.DEFAULT_CHARSET
-        if mimetype:
-            content_type = mimetype     # For backwards compatibility
-        if not content_type:
-            content_type = "%s; charset=%s" % (settings.DEFAULT_CONTENT_TYPE,
-                    settings.DEFAULT_CHARSET)
+        self.cookies = SimpleCookie()
+
         if not isinstance(content, basestring) and hasattr(content, '__iter__'):
             self._container = content
             self._is_string = False
         else:
             self._container = [content]
             self._is_string = True
-        self.cookies = SimpleCookie()
+
+        if mimetype:
+            content_type = mimetype     # For backwards compatibility
+        if not content_type:
+            content_type = "%s; charset=%s" % (settings.DEFAULT_CONTENT_TYPE,
+                                               self._charset)
+        self['Content-Type'] = content_type
+
         if status:
             self.status_code = status
 
-        # _headers is a mapping of the lower-case name to the original case of
-        # the header (required for working with legacy systems) and the header
-        # value.
-        self._headers = {'content-type': ('Content-Type', content_type)}
-
     def __str__(self):
         """Full HTTP message, including headers."""
         return '\n'.join(['%s: %s' % (key, value)