Ticket #5176: 0001-Fixed-5176-TestClient-now-can-accept-SimpleCookies-w.patch

AUTHORS

@@ -262 +262 @@
     Lau Bech Lauritzen
     Rune Rønde Laursen <runerl@skjoldhoej.dk>
     Eugene Lazutkin <http://lazutkin.com/blog/>
-    lcordier@point45.com
+    Louis Cordier <lcordier@gmail.com>
     Jeong-Min Lee <falsetru@gmail.com>
     Tai Lee <real.human@mrmachine.net>
     Jannis Leidel <jl@websushi.org>

django/utils/cache.py

@@ -23 +23 @@
     set
 except NameError:
     from sets import Set as set   # Python 2.3 fallback
+from Cookie import SimpleCookie
 
 from django.conf import settings
 from django.core.cache import cache
@@ -142 +143 @@
     ctx = md5_constructor()
     for header in headerlist:
         value = request.META.get(header, None)
+        if isinstance(value, SimpleCookie):
+            value = value.output()
+
         if value is not None:
             ctx.update(value)
     path = md5_constructor(iri_to_uri(request.path))

tests/regressiontests/test_client_regress/models.py

@@ -3 +3 @@
 Regression tests for the Test Client, especially the customized assertions.
 """
 import os
-from django.conf import settings
+from Cookie import SimpleCookie
 
+from django.conf import settings
 from django.test import Client, TestCase
 from django.test.utils import ContextList
 from django.core.urlresolvers import reverse
@@ -385 +386 @@
         # default client.
         self.assertRedirects(response, "http://testserver/test_client_regress/get_view/")
 
+class CookieTests(TestCase):
+
+    def test_cookies(self):
+        "Check that cookies work in the test client, see ticket #5176."
+
+        c = Client()
+        response = c.get('/test_client_regress/set_cookie/')
+
+        self.assert_(isinstance(response.cookies, SimpleCookie))
+        self.assert_('Set-Cookie: test_cookie=test_value; Path=/' in response.cookies.output())
+
 class URLEscapingTests(TestCase):
     def test_simple_argument_get(self):
         "Get a view that has a simple string argument"

tests/regressiontests/test_client_regress/urls.py

@@ -24 +24 @@
     (r'^request_methods/$', views.request_methods_view),
     (r'^check_unicode/$', views.return_unicode),
     (r'^parse_unicode_json/$', views.return_json_file),
+    (r'^set_cookie/$', views.set_cookie_view),
 )

tests/regressiontests/test_client_regress/views.py

@@ -86 +86 @@
                             mimetype='application/json; charset=' + charset)
     response['Content-Disposition'] = 'attachment; filename=testfile.json'
     return response
+
+def set_cookie_view(request):
+    "A view that sets a cookie."
+    response = HttpResponse('set cookie')
+    response.set_cookie('test_cookie', 'test_value')
+
+    return response