Ticket #19585: 19585-1.diff

django/http/cookie.py

@@ -1 +1 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.utils.encoding import force_str
+from django.utils import six
 from django.utils.six.moves import http_cookies
 
 
@@ -48 +49 @@
         if not _cookie_allows_colon_in_names:
             def load(self, rawdata):
                 self.bad_cookies = set()
-                super(SimpleCookie, self).load(force_str(rawdata))
+                if not six.PY3 and isinstance(rawdata, six.text_type):
+                    rawdata = force_str(rawdata)
+                super(SimpleCookie, self).load(rawdata)
                 for key in self.bad_cookies:
                     del self[key]
 

tests/regressiontests/httpwrappers/tests.py

@@ -588 +588 @@
         c['name']['httponly'] = True
         self.assertTrue(c['name']['httponly'])
 
+    def test_load_dict(self):
+        c = SimpleCookie()
+        c.load({'name': 'val'})
+        self.assertEqual(c['name'].value, 'val')