Ticket #5956: unicode_http_headers.diff

django/http/__init__.py

@@ -276 +276 @@
-        return '\n'.join(['%s: %s' % (key, value)
-            for key, value in self._headers.values()]) \
-            + '\n\n' + self.content
+            
+    def _encoded(self, val):
+        if isinstance(val, unicode):
+            return val.encode(self._charset)
+        return val
-
-    def __setitem__(self, header, value):
-
+
+
-
-    def __delitem__(self, header):
-        try:

tests/regressiontests/httpwrappers/tests.py

@@ -391 +391 @@
->>> q.getlist('foo')
-[u'bar', u'\ufffd']
-
+######################################
+# HttpResponse with Unicode headers  #
+######################################
+
+>>> r = HttpResponse()
+
+If we insert a unicode value it will be converted to a string. This is done
+because the handlers (WSGI/mod_python) expect binary data and will break on
+non-ascii unicode.
+
+>>> r['value'] = u't\xebst value'
+>>> type(r['value'])
+<type 'str'>
+
+It uses the charset of the response for encoding it. By default it is utf-8.
+
+>>> type(r['value'].decode('utf8'))
+<type 'unicode'>
+
+The response also converts unicode keys to strings.
+
+>>> r[u't\xebst'] = 'testing key'
+>>> type(list(sorted(r.items()))[1][0])
+<type 'str'>
+
+This only happens when you call items since the implementation uses a system
+where the original key is used for normal dict lookups.
+
+>>> u't\xebst' in r 
+True
+
-"""
-
-
+, HttpResponse
-
-if __name__ == "__main__":
-    import doctest