瀏覽代碼

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

This is necessary for the 'utils' tests to pass.
Aymeric Augustin 12 年之前
父節點
當前提交
bf4da7a442
共有 1 個文件被更改,包括 6 次插入1 次删除
  1. 6 1
      django/http/__init__.py

+ 6 - 1
django/http/__init__.py

@@ -549,7 +549,12 @@ class HttpResponse(object):
         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