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

Proposed by Elliot Murphy
Status: Merged
Merged at revision: not available
Proposed branch: lp:~statik/ubuntu/lucid/python-django/fix-cookies-bug513719
Merge into: lp:ubuntu/lucid/python-django
Diff against target: 60 lines (+28/-1)
4 files modified
debian/changelog (+6/-0)
debian/control (+2/-1)
debian/patches/07_test_client_cookie_fix.diff (+19/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~statik/ubuntu/lucid/python-django/fix-cookies-bug513719
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+18273@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Elliot Murphy (statik) wrote :

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.

Revision history for this message
James Westby (james-w) wrote :

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

Revision history for this message
Elliot Murphy (statik) wrote :

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/

28. By Elliot Murphy

Tagged patch 7 per debian patch tagging guidelines.

Revision history for this message
Elliot Murphy (statik) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-12-01 23:46:22 +0000
3+++ debian/changelog 2010-01-31 04:39:14 +0000
4@@ -1,3 +1,9 @@
5+python-django (1.1.1-2ubuntu1) lucid; urgency=low
6+
7+ * Fix django test client cookie handling (LP: #513719)
8+
9+ -- Elliot Murphy <elliot@ubuntu.com> Fri, 29 Jan 2010 13:01:27 -0500
10+
11 python-django (1.1.1-2) unstable; urgency=low
12
13 * Remove embedded "decimal" code copy and use system version instead. The
14
15=== modified file 'debian/control'
16--- debian/control 2009-12-01 23:46:22 +0000
17+++ debian/control 2010-01-31 04:39:14 +0000
18@@ -1,7 +1,8 @@
19 Source: python-django
20 Section: python
21 Priority: optional
22-Maintainer: Chris Lamb <lamby@debian.org>
23+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
24+XSBC-Original-Maintainer: Chris Lamb <lamby@debian.org>
25 Uploaders: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>, Raphaël Hertzog <hertzog@debian.org>
26 Standards-Version: 3.8.3
27 Build-Depends: debhelper (>= 7.0.50), python-support, quilt (>= 0.46-7~), python (>= 2.5) | python-sqlite
28
29=== added file 'debian/patches/07_test_client_cookie_fix.diff'
30--- debian/patches/07_test_client_cookie_fix.diff 1970-01-01 00:00:00 +0000
31+++ debian/patches/07_test_client_cookie_fix.diff 2010-01-31 04:39:14 +0000
32@@ -0,0 +1,19 @@
33+From: James Henstridge <jamesh@ubuntu.com>
34+Subject: Fix Django test client cookie handling with latest python2.6 upload
35+Origin: upstream, http://code.djangoproject.com/changeset/12343
36+Bug: http://code.djangoproject.com/ticket/12720
37+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-django/+bug/513719
38+Reviewed-By: Elliot Murphy <elliot@ubuntu.com>
39+Last-Update: 2010-01-30
40+
41+--- python-django.orig/django/test/client.py 2010-01-29 13:09:25.885960656 -0500
42++++ python-django/django/test/client.py 2010-01-29 13:10:15.622491350 -0500
43+@@ -193,7 +193,7 @@
44+ using the arguments to the request.
45+ """
46+ environ = {
47+- 'HTTP_COOKIE': self.cookies,
48++ 'HTTP_COOKIE': self.cookies.output(header='', sep='; '),
49+ 'PATH_INFO': '/',
50+ 'QUERY_STRING': '',
51+ 'REMOTE_ADDR': '127.0.0.1',
52
53=== modified file 'debian/patches/series'
54--- debian/patches/series 2009-12-01 23:46:22 +0000
55+++ debian/patches/series 2010-01-31 04:39:14 +0000
56@@ -4,3 +4,4 @@
57 04_hyphen-manpage.diff
58 05_ftbfs_in_november.diff
59 06_python_2.6.3_regression.diff
60+07_test_client_cookie_fix.diff

Subscribers

People subscribed via source and target branches

to all changes: