Merge lp:~statik/ubuntu/lucid/python-django/fix-cookies-bug513719 into lp:ubuntu/lucid/python-django

[Elliot Murphy]

[Elliot Murphy (statik)]

This fix has already been committed upstream, and I have confirmed that building/installing this package allows 'make check' to pass on lp:django-openid-auth, which is otherwise totally broken in lucid. I would be grateful if someone uploaded this revision.

[James Westby (james-w)]

Hey Elliot,

I'm stuck on slow internet so can't test this right now, but I
would love to see

  https://wiki.ubuntu.com/UbuntuDevelopment/PatchTaggingGuidelines

used.

Feel free to just drop the relevant information here and I can add
it as I merge. I won't block on it though, I'll just look it up myself
if I get some better internet before I hear back.

Thanks,

James

[Elliot Murphy (statik)]

So I've been curious about patch tagging guidelines and now I finally
see when they should be used :)

I'll add the tags now and push in a few minutes. Thanks James!
--
Elliot Murphy | https://launchpad.net/~statik/

[lp:~statik/ubuntu/lucid/python-django/fix-cookies-bug513719]

28. By Elliot Murphy on 2010-01-31

Tagged patch 7 per debian patch tagging guidelines.

[Elliot Murphy (statik)]

Added the patch tagging, pushed, and verified that the package still builds, installs, and the installed package fixes the problem.

=== modified file 'debian/changelog'
--- debian/changelog	2009-12-01 23:46:22 +0000
+++ debian/changelog	2010-01-31 04:39:14 +0000
@@ -1,3 +1,9 @@
+python-django (1.1.1-2ubuntu1) lucid; urgency=low
+
+  * Fix django test client cookie handling (LP: #513719)
+
+ -- Elliot Murphy <[e-mail]>  Fri, 29 Jan 2010 13:01:27 -0500
+
 python-django (1.1.1-2) unstable; urgency=low
 
   * Remove embedded "decimal" code copy and use system version instead. The
 
=== modified file 'debian/control'
--- debian/control	2009-12-01 23:46:22 +0000
+++ debian/control	2010-01-31 04:39:14 +0000
@@ -1,7 +1,8 @@
 Source: python-django
 Section: python
 Priority: optional
-Maintainer: Chris Lamb <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Chris Lamb <[e-mail]>
 Uploaders: Debian Python Modules Team <[e-mail]>, Raphaël Hertzog <[e-mail]>
 Standards-Version: 3.8.3
 Build-Depends: debhelper (>= 7.0.50), python-support, quilt (>= 0.46-7~), python (>= 2.5) | python-sqlite
 
=== added file 'debian/patches/07_test_client_cookie_fix.diff'
--- debian/patches/07_test_client_cookie_fix.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/07_test_client_cookie_fix.diff	2010-01-31 04:39:14 +0000
@@ -0,0 +1,19 @@
+From: James Henstridge <[e-mail]>
+Subject: Fix Django test client cookie handling with latest python2.6 upload
+Origin: upstream, http://code.djangoproject.com/changeset/12343
+Bug: http://code.djangoproject.com/ticket/12720
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-django/+bug/513719
+Reviewed-By: Elliot Murphy <[e-mail]>
+Last-Update: 2010-01-30
+
+--- python-django.orig/django/test/client.py	2010-01-29 13:09:25.885960656 -0500
++++ python-django/django/test/client.py	2010-01-29 13:10:15.622491350 -0500
+@@ -193,7 +193,7 @@
+         using the arguments to the request.
+         """
+         environ = {
+-            'HTTP_COOKIE':      self.cookies,
++            'HTTP_COOKIE':      self.cookies.output(header='', sep='; '),
+             'PATH_INFO':         '/',
+             'QUERY_STRING':      '',
+             'REMOTE_ADDR':       '127.0.0.1',
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2009-12-01 23:46:22 +0000
+++ debian/patches/series	2010-01-31 04:39:14 +0000
@@ -4,3 +4,4 @@
 04_hyphen-manpage.diff
 05_ftbfs_in_november.diff
 06_python_2.6.3_regression.diff
+07_test_client_cookie_fix.diff