[Python-modules-commits] r11995 - in packages/python-django/trunk/debian (3 files)

[lamby at users.alioth.debian.org]

    Date: Saturday, February 27, 2010 @ 19:59:12
  Author: lamby
Revision: 11995

Apply patch from <http://code.djangoproject.com/ticket/12720> to fix FTBFS under Python 2.6.

Added:
  packages/python-django/trunk/debian/patches/08-python_2.6_cookie_regression.diff
Modified:
  packages/python-django/trunk/debian/changelog
  packages/python-django/trunk/debian/patches/series

Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog	2010-02-27 19:29:26 UTC (rev 11994)
+++ packages/python-django/trunk/debian/changelog	2010-02-27 19:59:12 UTC (rev 11995)
@@ -2,6 +2,8 @@
 
   * Add python-yaml to Suggests; without it, Django silently fails to load YAML
     fixtures. (Closes: #570963)
+  * Apply patch from <http://code.djangoproject.com/ticket/12720> to fix FTBFS
+    under Python 2.6. (Closes: #571553)
 
  -- Chris Lamb <lamby at debian.org>  Wed, 24 Feb 2010 07:57:24 +0000
 

Added: packages/python-django/trunk/debian/patches/08-python_2.6_cookie_regression.diff
===================================================================
--- packages/python-django/trunk/debian/patches/08-python_2.6_cookie_regression.diff	                        (rev 0)
+++ packages/python-django/trunk/debian/patches/08-python_2.6_cookie_regression.diff	2010-02-27 19:59:12 UTC (rev 11995)
@@ -0,0 +1,29 @@
+Forwarded-Upstream: Not needed
+Author: James Henstridge
+Source: http://code.djangoproject.com/changeset/12344
+
+ [The] Python 2.6 package included unreleased fixes from the release26-maint
+ branch. In particular it included the following bug fix to the Cookie module:
+
+   http://bugs.python.org/issue5275
+
+ When the django.test client builds up a WSGI environment, it passes a
+ SimpleCookie? instance for HTTP_COOKIE. Prior to the change,
+ django.http.parse_cookie() would copy the morsels directly. After the change,
+ the values for all the cookies are the str() version of the morsels (e.g.
+ "Set-Cookie: sessionid=value" instead of "value").
+
+ This breaks any tests that depend on cookie handling (e.g. those that depend
+ on cookie authentication).
+
+                           <http://code.djangoproject.com/ticket/12720>
+
+--- a/django/test/client.py (revision 11657)
++++ b/django/test/client.py (revision 12344)
+@@ -194,5 +194,5 @@
+         """
+         environ = {
+-            'HTTP_COOKIE':      self.cookies,
++            'HTTP_COOKIE':       self.cookies.output(header='', sep='; '),
+             'PATH_INFO':         '/',
+             'QUERY_STRING':      '',

Modified: packages/python-django/trunk/debian/patches/series
===================================================================
--- packages/python-django/trunk/debian/patches/series	2010-02-27 19:29:26 UTC (rev 11994)
+++ packages/python-django/trunk/debian/patches/series	2010-02-27 19:59:12 UTC (rev 11995)
@@ -5,3 +5,4 @@
 05_ftbfs_in_november.diff
 06_python_2.6.3_regression.diff
 07-to_locale-sr_latn.diff
+08-python_2.6_cookie_regression.diff