Permalink
Browse files

Fixed #19802 -- Fixed HttpResponse.set_cookie() with unicode data on …

…Python 2.

Thanks django at patrickbregman.eu for the report.
  • Loading branch information...
qingfeng authored and timgraham committed Aug 1, 2014
1 parent 0f2ceee commit 0d23450e81dc355c354a873fe187687e4aaa4886
Showing with 10 additions and 1 deletion.
  1. +2 −1 django/http/response.py
  2. +8 −0 tests/requests/tests.py
View
@@ -13,7 +13,7 @@
from django.core.serializers.json import DjangoJSONEncoder
from django.http.cookie import SimpleCookie
from django.utils import six, timezone
-from django.utils.encoding import force_bytes, force_text, iri_to_uri
+from django.utils.encoding import force_bytes, force_text, force_str, iri_to_uri
from django.utils.http import cookie_date
from django.utils.six.moves import map
from django.utils.six.moves.urllib.parse import urlparse
@@ -221,6 +221,7 @@ def set_cookie(self, key, value='', max_age=None, expires=None, path='/',
If it is a ``datetime.datetime`` object then ``max_age`` will be calculated.
"""
+ value = force_str(value)
self.cookies[key] = value
if expires is not None:
if isinstance(expires, datetime.datetime):
View
@@ -14,6 +14,7 @@
from django.test.client import FakePayload
from django.test.utils import str_prefix
from django.utils import six
+from django.utils.encoding import force_str
from django.utils.http import cookie_date, urlencode
from django.utils.six.moves.urllib.parse import urlencode as original_urlencode
from django.utils.timezone import utc
@@ -193,6 +194,13 @@ def test_httponly_cookie(self):
self.assertTrue('; httponly' in str(example_cookie))
self.assertTrue(example_cookie['httponly'])
+ def test_unicode_cookie(self):
+ "Verify HttpResponse.set_cookie() works with unicode data."
+ response = HttpResponse()
+ cookie_value = '清風'
+ response.set_cookie('test', cookie_value)
+ self.assertEqual(force_str(cookie_value), response.cookies['test'].value)
+
def test_limited_stream(self):
# Read all of a limited stream
stream = LimitedStream(BytesIO(b'test'), 2)

0 comments on commit 0d23450

Please sign in to comment.