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

[hertzog at users.alioth.debian.org]

    Date: Tuesday, November 20, 2012 @ 07:29:02
  Author: hertzog
Revision: 23035

Don't fail self-tests if MANAGERS or ADMINS is defined in settings.py.
Add upstream patch debian/patches/01_fix-self-tests.diff.
Thanks to Jamie Strandboge <jamie at ubuntu.com> for the report.
Closes: #693752 LP: #1080204

Added:
  packages/python-django/trunk/debian/patches/01_fix-self-tests.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	2012-11-19 08:53:25 UTC (rev 23034)
+++ packages/python-django/trunk/debian/changelog	2012-11-20 07:29:02 UTC (rev 23035)
@@ -1,3 +1,12 @@
+python-django (1.4.2-2) unstable; urgency=low
+
+  * Don't fail self-tests if MANAGERS or ADMINS is defined in settings.py.
+    Add upstream patch debian/patches/01_fix-self-tests.diff.
+    Thanks to Jamie Strandboge <jamie at ubuntu.com> for the report.
+    Closes: #693752 LP: #1080204
+
+ -- Raphaël Hertzog <hertzog at debian.org>  Tue, 20 Nov 2012 08:28:37 +0100
+
 python-django (1.4.2-1) unstable; urgency=high
 
   * New upstream security and maintenance release. Closes: #691145

Added: packages/python-django/trunk/debian/patches/01_fix-self-tests.diff
===================================================================
--- packages/python-django/trunk/debian/patches/01_fix-self-tests.diff	                        (rev 0)
+++ packages/python-django/trunk/debian/patches/01_fix-self-tests.diff	2012-11-20 07:29:02 UTC (rev 23035)
@@ -0,0 +1,36 @@
+From: Claude Paroz <claude at 2xlibre.net>
+Date: Mon, 29 Oct 2012 17:26:10 +0100
+Subject: [PATCH] Fixed #19172 -- Isolated poisoned_http_host tests from 500 handlers
+Origin: upstream, https://code.djangoproject.com/changeset/ad2d57a2ccb6316001205739090a2a1d79453207
+Bug: https://code.djangoproject.com/ticket/19172
+Applied-Upstream: 1.4.3
+Bug-Debian: http://bugs.debian.org/693752
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-django/+bug/1080204
+
+Thanks bernardofontes for the report.
+---
+ django/contrib/auth/tests/views.py |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: python-django-1.4.1/django/contrib/auth/tests/views.py
+===================================================================
+--- python-django-1.4.1.orig/django/contrib/auth/tests/views.py	2012-11-19 14:15:53.000000000 -0600
++++ python-django-1.4.1/django/contrib/auth/tests/views.py	2012-11-19 14:15:53.000000000 -0600
+@@ -118,6 +118,8 @@
+         self.assertTrue("http://adminsite.com" in mail.outbox[0].body)
+         self.assertEqual(settings.DEFAULT_FROM_EMAIL, mail.outbox[0].from_email)
+ 
++    # Skip any 500 handler action (like sending more mail...)
++    @override_settings(DEBUG_PROPAGATE_EXCEPTIONS=True)
+     def test_poisoned_http_host(self):
+         "Poisoned HTTP_HOST headers can't be used for reset emails"
+         # This attack is based on the way browsers handle URLs. The colon
+@@ -134,6 +136,8 @@
+             )
+         self.assertEqual(len(mail.outbox), 0)
+ 
++    # Skip any 500 handler action (like sending more mail...)
++    @override_settings(DEBUG_PROPAGATE_EXCEPTIONS=True)
+     def test_poisoned_http_host_admin_site(self):
+         "Poisoned HTTP_HOST headers can't be used for reset emails on admin views"
+         with self.assertRaises(SuspiciousOperation):

Modified: packages/python-django/trunk/debian/patches/series
===================================================================
--- packages/python-django/trunk/debian/patches/series	2012-11-19 08:53:25 UTC (rev 23034)
+++ packages/python-django/trunk/debian/patches/series	2012-11-20 07:29:02 UTC (rev 23035)
@@ -1,3 +1,4 @@
+01_fix-self-tests.diff
 02_disable-sources-in-sphinxdoc.diff
 03_manpage.diff
 06_use_debian_geoip_database_as_default.diff