← Back to branch summary

~ubuntu-branches/ubuntu/lucid/python-django/lucid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/07_test_client_cookie_fix.diff

  • Committer: James Westby
  • Date: 2010-01-31 21:15:35 UTC
  • mfrom: (26.1.2 python-django)
  • Revision ID: james.westby@canonical.com-20100131211535-i5mfrz2yiioam11s
Tags: 1.1.1-2ubuntu1
Fix django test client cookie handling.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/07_test_client_cookie_fix.diff
 
1
From: James Henstridge <jamesh@ubuntu.com>
 
2
Subject: Fix Django test client cookie handling with latest python2.6 upload
 
3
Origin: upstream, http://code.djangoproject.com/changeset/12343
 
4
Bug: http://code.djangoproject.com/ticket/12720
 
5
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-django/+bug/513719
 
6
Reviewed-By: Elliot Murphy <elliot@ubuntu.com>
 
7
Last-Update: 2010-01-30
 
8
 
 
9
--- python-django.orig/django/test/client.py    2010-01-29 13:09:25.885960656 -0500
 
10
+++ python-django/django/test/client.py 2010-01-29 13:10:15.622491350 -0500
 
11
@@ -193,7 +193,7 @@
 
12
         using the arguments to the request.
 
13
         """
 
14
         environ = {
 
15
-            'HTTP_COOKIE':      self.cookies,
 
16
+            'HTTP_COOKIE':      self.cookies.output(header='', sep='; '),
 
17
             'PATH_INFO':         '/',
 
18
             'QUERY_STRING':      '',
 
19
             'REMOTE_ADDR':       '127.0.0.1',