Ticket #5176: 0001_fix_test_client.diff

django/test/client.py

@@ -177 +177 @@
         return {}
     session = property(_session)
 
+    def _format_cookies(self):
+        """
+        Generates a string suitable for a HTTP request from a SimpleCookie
+        cookie jar.
+        
+        Ideally this should be done with a propper cookie jar, where only
+        the cookies valid for the request path and time are send in the
+        request. Unfortunatly cookielib.CookieJar isn't the right candidate.
+        """
+        cookie_strings = self.cookies.output().split('Set-Cookie: ')
+        while '' in cookie_strings:
+            cookie_strings.remove('')
+        
+        cookies = []
+        for cookie in cookie_strings:
+            cookies.append(cookie.split(';', 1)[0])
+        
+        return '; '.join(cookies)
+
     def request(self, **request):
         """
         The master request method. Composes the environment dictionary
@@ -185 +204 @@
         using the arguments to the request.
         """
         environ = {
-            'HTTP_COOKIE':      self.cookies,
+            'HTTP_COOKIE':       self._format_cookies(),
             'PATH_INFO':         '/',
             'QUERY_STRING':      '',
             'REQUEST_METHOD':    'GET',

AUTHORS

@@ -237 +237 @@
     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>
     Jannis Leidel <jl@websushi.org>
     Christopher Lenz <http://www.cmlenz.net/>