Bug#755667: django-openid-auth: diff for NMU version 0.5-2.1

[Andrew Starr-Bochicchio]

On Fri, Oct 10, 2014 at 5:33 AM, Neil Williams li...@codehelp.co.uk wrote:
 I've prepared an NMU for django-openid-auth (versioned as 0.5-2.1) and
 expect to upload it to unstable today.

Hi Neal,

Thanks for the patch! I've imported your NMU into the Debian Python
Modules Team repository.

Thanks!

-- Andrew Starr-Bochicchio

   Ubuntu Developer https://launchpad.net/~andrewsomething
   Debian Developer http://qa.debian.org/developer.php?login=asb
   PGP/GPG Key ID: D53FDCB1


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#755667: django-openid-auth: diff for NMU version 0.5-2.1

[Neil Williams]

Control: tags 755667 + patch
Control: tags 755667 + pending

Dear maintainer,

I've prepared an NMU for django-openid-auth (versioned as 0.5-2.1) and
expect to upload it to unstable today.

Regards.
diff -Nru django-openid-auth-0.5/debian/changelog django-openid-auth-0.5/debian/changelog
--- django-openid-auth-0.5/debian/changelog	2014-02-22 18:00:53.0 +
+++ django-openid-auth-0.5/debian/changelog	2014-10-10 09:39:16.0 +0100
@@ -1,3 +1,10 @@
+django-openid-auth (0.5-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Update for Django 1.7 support (Closes: #755667)
+
+ -- Neil Williams codeh...@debian.org  Fri, 10 Oct 2014 09:38:59 +0100
+
 django-openid-auth (0.5-2) unstable; urgency=medium
 
   * debian/patches/django1.6compat.patch: Fix compatibility
diff -Nru django-openid-auth-0.5/debian/patches/django1.7compat.patch django-openid-auth-0.5/debian/patches/django1.7compat.patch
--- django-openid-auth-0.5/debian/patches/django1.7compat.patch	1970-01-01 01:00:00.0 +0100
+++ django-openid-auth-0.5/debian/patches/django1.7compat.patch	2014-10-10 10:28:39.0 +0100
@@ -0,0 +1,32 @@
+Description: Adapt for change in admin login behaviour
+ OPENID_USE_AS_ADMIN_LOGIN no longer fails to an openid login
+ page with django1.7, despite openid working normally. Adapt the
+ test cases to suit.
+Author: Neil Williams codeh...@debian.org
+Bug-Debian: https://bugs.debian.org/755667
+
+---
+
+--- django-openid-auth-0.5.orig/django_openid_auth/tests/test_admin.py
 django-openid-auth-0.5/django_openid_auth/tests/test_admin.py
+@@ -70,8 +70,9 @@ class SiteAdminTests(TestCase):
+ create_user()
+ self.client.login(username='testing', password='test')
+ response = self.client.get('/admin/')
+-self.assertTrue('User testing does not have admin access.' in
+-response.content, 'Missing error message in response')
++self.assertEqual(302, response.status_code)
++self.assertEqual('http://testserver/admin/login/?next=/admin/',
++ response['Location'])
+ 
+ def test_admin_site_with_openid_login_non_authenticated_user(self):
+ 
+@@ -80,7 +81,7 @@ class SiteAdminTests(TestCase):
+ 
+ response = self.client.get('/admin/')
+ self.assertEqual(302, response.status_code)
+-self.assertEqual('http://testserver/openid/login/?next=/admin/',
++self.assertEqual('http://testserver/admin/login/?next=/admin/',
+  response['Location'])
+ 
+ 
diff -Nru django-openid-auth-0.5/debian/patches/series django-openid-auth-0.5/debian/patches/series
--- django-openid-auth-0.5/debian/patches/series	2014-02-22 17:09:40.0 +
+++ django-openid-auth-0.5/debian/patches/series	2014-10-10 10:27:04.0 +0100
@@ -1,2 +1,3 @@
 django1.5compat.patch
 django1.6compat.patch
+django1.7compat.patch