[Python-modules-commits] r30063 - in packages/python-django-registration/tags (10 files)
hertzog at users.alioth.debian.org
hertzog at users.alioth.debian.org
Wed Aug 6 22:05:16 UTC 2014
Date: Wednesday, August 6, 2014 @ 22:05:15
Author: hertzog
Revision: 30063
[svn-buildpackage] Tagging python-django-registration 1.0+dfsg-2
Added:
packages/python-django-registration/tags/1.0+dfsg-2/
packages/python-django-registration/tags/1.0+dfsg-2/debian/changelog
(from rev 30062, packages/python-django-registration/trunk/debian/changelog)
packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/django-1.7-compat.patch
(from rev 30062, packages/python-django-registration/trunk/debian/patches/django-1.7-compat.patch)
packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/fix-test-suite.patch
(from rev 30062, packages/python-django-registration/trunk/debian/patches/fix-test-suite.patch)
packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/more-django-1.7-fixes.patch
(from rev 30062, packages/python-django-registration/trunk/debian/patches/more-django-1.7-fixes.patch)
packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/series
(from rev 30062, packages/python-django-registration/trunk/debian/patches/series)
packages/python-django-registration/tags/1.0+dfsg-2/debian/rules
(from rev 30062, packages/python-django-registration/trunk/debian/rules)
Deleted:
packages/python-django-registration/tags/1.0+dfsg-2/debian/changelog
packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/series
packages/python-django-registration/tags/1.0+dfsg-2/debian/rules
Deleted: packages/python-django-registration/tags/1.0+dfsg-2/debian/changelog
===================================================================
--- packages/python-django-registration/trunk/debian/changelog 2014-08-06 11:41:33 UTC (rev 30061)
+++ packages/python-django-registration/tags/1.0+dfsg-2/debian/changelog 2014-08-06 22:05:15 UTC (rev 30063)
@@ -1,234 +0,0 @@
-python-django-registration (1.0+dfsg-1) unstable; urgency=medium
-
- * Drop David Spreen from Uploaders. Closes: #738931
- * Add send_signal_only_once_when_activating_user.patch submitted
- by Mark Caglienzi <mark.caglienzi at gmail.com>. Closes: #745756
- * Update debian/copyright to follow new copyright format.
- * Repack upstream tarball to drop docs/_build/ containing javascript
- files without sources.
- * Update Standards-Version to 3.9.5
- * Update debhelper compat level to 9.
-
- -- Raphaël Hertzog <hertzog at debian.org> Tue, 27 May 2014 14:23:29 +0200
-
-python-django-registration (1.0-1) unstable; urgency=low
-
- * New stable upstream.
- * Update to Std.-Ver. 3.9.4 (no changes needed).
-
- -- Stephan Sürken <absurd at debian.org> Mon, 01 Jul 2013 14:36:29 +0200
-
-python-django-registration (0.9~b0+hg440+ab1-2) unstable; urgency=low
-
- * control: django dependency must now be >= 1.4.
-
- -- Stephan Sürken <absurd at debian.org> Tue, 04 Jun 2013 14:09:47 +0200
-
-python-django-registration (0.9~b0+hg440+ab1-1) unstable; urgency=low
-
- * New self-created upstream from hg tip 440:
- - Make setup also work with django 1.4.
- * Upload to unstable.
-
- -- Stephan Sürken <absurd at debian.org> Sun, 02 Jun 2013 14:26:51 +0200
-
-python-django-registration (0.9~b0+hg440-1~exp1) experimental; urgency=low
-
- [ Jakub Wilk ]
- * Use canonical URIs for Vcs-* fields.
-
- [ Stephan Sürken ]
- * New self-created upstream from hg tip 440:
- - Updates for django 1.5 (Closes: #709622).
- * control: Add myself to Uploaders.
- * No feedback from upstream yet, hence experimental for now.
-
- -- Stephan Sürken <absurd at debian.org> Fri, 31 May 2013 16:32:44 +0200
-
-python-django-registration (0.8-2) unstable; urgency=low
-
- * Drop docs/_build entirely on clean so that we don't keep around
- docs/_build/doctrees which might not work with python3-sphinx.
- Closes: #697721
-
- -- Raphaël Hertzog <hertzog at debian.org> Thu, 10 Jan 2013 09:44:11 +0100
-
-python-django-registration (0.8-1) unstable; urgency=low
-
- * New upstream release.
- - Now fully compatible with Django 1.4 which is in Debian Wheezy.
- - No longer use the deprecated "sha" module. Closes: #581721
- * Update Standards-Version to 3.9.3.
- * Replace python-docutil build-dependency by one on python-sphinx to be able
- to generate the HTML documentation with the new upstream makefile.
- * Update the dh_auto_build override to include the "make html" call
- that generates the documentation and create
- debian/python-django-registration.docs to install the generated
- documentation.
- * Create a dh_auto_clean override to remove the (upstream provided and)
- generated documentation in docs/_build/html.
- * Use dh_sphinxdoc to get rid of embedded javascript files that sphinx-build
- generates. Add accordingly ${sphinxdoc:Depends} to Depends.
- * Update the doc-base registration to use the new path for the HTML
- documentation.
-
- -- Raphaël Hertzog <hertzog at debian.org> Tue, 10 Jul 2012 16:04:20 +0200
-
-python-django-registration (0.7-3) unstable; urgency=low
-
- * Provide README.Debian in place of upstream's README.txt. Closes: #646589
- * Switch to dh_python2 instead of python-support.
- * Bump debhelper compat level to 8
- * Bump Standards-Version to 3.9.2 (no change needed)
- * Update URL in copyright file.
- * Drop the article in the description (lintian warning).
- * Update Vcs-Browser URL to point to the new location at anonscm.debian.org
-
- -- Raphaël Hertzog <hertzog at debian.org> Wed, 02 Nov 2011 11:43:40 +0100
-
-python-django-registration (0.7-2) unstable; urgency=low
-
- * Add accent on my name in debian/control.
- * Change build-depends on python-dev to python.
- * Switch to source format "3.0 (quilt)".
- * Switch to debhelper 7 tiny rules file and compat mode 7.
- * Upgrade Standards-Version to 3.8.3.
- * Dropped useless debian/pycompat.
- * Add missing ${misc:Depends} on Depends line.
- * Register documentation with doc-base.
-
- -- Raphaël Hertzog <hertzog at debian.org> Wed, 27 Jan 2010 16:09:24 +0100
-
-python-django-registration (0.7-1) unstable; urgency=low
-
- [ Sandro Tosi ]
- * debian/control
- - switch Vcs-Browser field to viewsvn
-
- [ Stephan Peijnik ]
- * New upstream release.
- * Updated debian/watch to use pypi.python.org as source of new upstream
- tarballs.
-
- [ Raphael Hertzog ]
- * Update URL in Homepage field to match new upstream site (it moved to
- Bitbucket).
- * Drop 02_overview_rst_fix.patch and 01_validators_removed.patch as they got
- merged upstream.
- * delete_expired_users.py does no more exist. It has been replaced with a
- manage.py sub-command (manage.py cleanupregistration) that you can invoke
- within any project using django-registration.
- * Drop .po files from binary package.
-
- -- Raphael Hertzog <hertzog at debian.org> Wed, 12 Nov 2008 10:06:06 +0100
-
-python-django-registration (0.6-3) unstable; urgency=low
-
- * Modified package to use quilt patchsys (requested by Raphael Hertzog).
- * Added myself to Uploaders.
- * Moved package to unstable, as it is compatible with the version of
- python-django in unstable.
- * debian/control:
- - Updated dependency on python-django (>= 1.0).
- - Removed Prority: optional from binary package.
- * debian/rules:
- - Removed simple-patchsys.mk from includes.
- - Added patchsys-quilt.mk to includes.
- - Made clean target depend on unpatch.
- * debian/patches/01_validators_removed.patch:
- - Pulled in bugfixes in revisions 167 and 168 from upstream SVN.
- This patch fixes the bug introduced by the removal of
- django.core.validators in python-django 1.0-1. (Closes: #498086)
- * debian/patches/02_overview_rst_fix.patch:
- - Fixes a typo in overview.txt causing rst2html to return an error.
- * Moved delete_expired_users.py script out of site-packages into
- /usr/share/doc/python-django-registration/examples.
- * Added debian/python-django-registration.README.Debian to document
- the delete_expired_users.py change.
- * Documented patches in debian/patches.
-
- -- Stephan Peijnik <debian at sp.or.at> Tue, 16 Sep 2008 12:06:09 +0200
-
-python-django-registration (0.6-2) experimental; urgency=low
-
- * debian/control:
- - added dependency on python-django (>= 1.0~beta1) (Thanks to Raphael
- Hertzog).
- * debian/rules:
- - added call to new compile-messages interface through django-admin.
- - remove ._django.po during clean.
-
- -- David Spreen <netzwurm at debian.org> Fri, 22 Aug 2008 12:32:04 -0700
-
-python-django-registration (0.6-1) experimental; urgency=low
-
- [ Sandro Tosi ]
- * debian/watch
- - fixed to work with code.google.com
-
- [ David Spreen ]
- * New upstream SVN snapshot to ensure compatibility with upcoming 1.0
- release of python-django.
- * debian/rules
- - Removed the call to compile-messages since it requires
- experimental django version. This will be added again once
- Django 1.0 enters sid.
- * debian/control:
- - Removed build-dependency on python-django. See above.
- - Depend on python-django (>= 1.0~beta1).
- - Updated policy version.
-
- -- David Spreen <netzwurm at debian.org> Thu, 21 Aug 2008 17:39:12 -0700
-
-python-django-registration (0.4p2-1) experimental; urgency=low
-
- * New upstream release.
-
- -- Raphael Hertzog <hertzog at debian.org> Sun, 02 Mar 2008 12:26:25 +0100
-
-python-django-registration (0.4p1-1) experimental; urgency=low
-
- [ Sandro Tosi ]
- * debian/control
- - uniforming Vcs-Browser field
-
- [ Raphael Hertzog ]
- * New upstream release.
- * Updated Standards-Version to 3.7.3 (no change).
- * Fix dependency on python-django to really require the experimental
- version. Closes: #460413
- * Move python-django, python-docutils and python-support from Build-Depends
- to Build-Depends-Indep as they are not needed during cleanup.
-
- -- Raphael Hertzog <hertzog at debian.org> Sat, 12 Jan 2008 15:58:38 +0100
-
-python-django-registration (0.3p5-1) experimental; urgency=low
-
- * New upstream release.
- * Drop debian/patches/01_fix_setup_py.patch which got integrated upstream.
- * Generate HTML for new (rst) documentation files.
-
- -- Raphael Hertzog <hertzog at debian.org> Mon, 08 Oct 2007 16:43:19 +0200
-
-python-django-registration (0.3p3-1) experimental; urgency=low
-
- [ Piotr Ożarowski ]
- * XS-Vcs-Browser and Homepage fields added
-
- [ Raphael Hertzog ]
- * New upstream release.
- * Renamed XS-Vcs* to Vcs-* since they are supported by dpkg now.
- * debian/patches/01_fix_setup_py.patch: Make sure that non *.py files
- like translations are also included. (patch forwarded upstream)
- * Compile translations into *.mo files with the django's make-messages.py.
- Build-Depends on python-django for this.
-
- -- Raphael Hertzog <hertzog at debian.org> Thu, 04 Oct 2007 18:23:37 +0200
-
-python-django-registration (0.2-1) experimental; urgency=low
-
- * Initial release.
- * Upload to experimental because it requires the development version
- of python-django.
-
- -- Raphael Hertzog <hertzog at debian.org> Tue, 31 Jul 2007 15:10:52 +0200
Copied: packages/python-django-registration/tags/1.0+dfsg-2/debian/changelog (from rev 30062, packages/python-django-registration/trunk/debian/changelog)
===================================================================
--- packages/python-django-registration/tags/1.0+dfsg-2/debian/changelog (rev 0)
+++ packages/python-django-registration/tags/1.0+dfsg-2/debian/changelog 2014-08-06 22:05:15 UTC (rev 30063)
@@ -0,0 +1,245 @@
+python-django-registration (1.0+dfsg-2) unstable; urgency=medium
+
+ * Fix and enable the test suite with fix-testsuite.patch. Ensure
+ it works with Django 1.6.
+ * Apply two patches for Django 1.7 compatibility:
+ - django-1.7-compat.patch grabbed in an upstream pull request
+ - more-django-1.7-fixes.patch authored by myself
+ Closes: #755653
+
+ -- Raphaël Hertzog <hertzog at debian.org> Wed, 06 Aug 2014 23:46:28 +0200
+
+python-django-registration (1.0+dfsg-1) unstable; urgency=medium
+
+ * Drop David Spreen from Uploaders. Closes: #738931
+ * Add send_signal_only_once_when_activating_user.patch submitted
+ by Mark Caglienzi <mark.caglienzi at gmail.com>. Closes: #745756
+ * Update debian/copyright to follow new copyright format.
+ * Repack upstream tarball to drop docs/_build/ containing javascript
+ files without sources.
+ * Update Standards-Version to 3.9.5
+ * Update debhelper compat level to 9.
+
+ -- Raphaël Hertzog <hertzog at debian.org> Tue, 27 May 2014 14:23:29 +0200
+
+python-django-registration (1.0-1) unstable; urgency=low
+
+ * New stable upstream.
+ * Update to Std.-Ver. 3.9.4 (no changes needed).
+
+ -- Stephan Sürken <absurd at debian.org> Mon, 01 Jul 2013 14:36:29 +0200
+
+python-django-registration (0.9~b0+hg440+ab1-2) unstable; urgency=low
+
+ * control: django dependency must now be >= 1.4.
+
+ -- Stephan Sürken <absurd at debian.org> Tue, 04 Jun 2013 14:09:47 +0200
+
+python-django-registration (0.9~b0+hg440+ab1-1) unstable; urgency=low
+
+ * New self-created upstream from hg tip 440:
+ - Make setup also work with django 1.4.
+ * Upload to unstable.
+
+ -- Stephan Sürken <absurd at debian.org> Sun, 02 Jun 2013 14:26:51 +0200
+
+python-django-registration (0.9~b0+hg440-1~exp1) experimental; urgency=low
+
+ [ Jakub Wilk ]
+ * Use canonical URIs for Vcs-* fields.
+
+ [ Stephan Sürken ]
+ * New self-created upstream from hg tip 440:
+ - Updates for django 1.5 (Closes: #709622).
+ * control: Add myself to Uploaders.
+ * No feedback from upstream yet, hence experimental for now.
+
+ -- Stephan Sürken <absurd at debian.org> Fri, 31 May 2013 16:32:44 +0200
+
+python-django-registration (0.8-2) unstable; urgency=low
+
+ * Drop docs/_build entirely on clean so that we don't keep around
+ docs/_build/doctrees which might not work with python3-sphinx.
+ Closes: #697721
+
+ -- Raphaël Hertzog <hertzog at debian.org> Thu, 10 Jan 2013 09:44:11 +0100
+
+python-django-registration (0.8-1) unstable; urgency=low
+
+ * New upstream release.
+ - Now fully compatible with Django 1.4 which is in Debian Wheezy.
+ - No longer use the deprecated "sha" module. Closes: #581721
+ * Update Standards-Version to 3.9.3.
+ * Replace python-docutil build-dependency by one on python-sphinx to be able
+ to generate the HTML documentation with the new upstream makefile.
+ * Update the dh_auto_build override to include the "make html" call
+ that generates the documentation and create
+ debian/python-django-registration.docs to install the generated
+ documentation.
+ * Create a dh_auto_clean override to remove the (upstream provided and)
+ generated documentation in docs/_build/html.
+ * Use dh_sphinxdoc to get rid of embedded javascript files that sphinx-build
+ generates. Add accordingly ${sphinxdoc:Depends} to Depends.
+ * Update the doc-base registration to use the new path for the HTML
+ documentation.
+
+ -- Raphaël Hertzog <hertzog at debian.org> Tue, 10 Jul 2012 16:04:20 +0200
+
+python-django-registration (0.7-3) unstable; urgency=low
+
+ * Provide README.Debian in place of upstream's README.txt. Closes: #646589
+ * Switch to dh_python2 instead of python-support.
+ * Bump debhelper compat level to 8
+ * Bump Standards-Version to 3.9.2 (no change needed)
+ * Update URL in copyright file.
+ * Drop the article in the description (lintian warning).
+ * Update Vcs-Browser URL to point to the new location at anonscm.debian.org
+
+ -- Raphaël Hertzog <hertzog at debian.org> Wed, 02 Nov 2011 11:43:40 +0100
+
+python-django-registration (0.7-2) unstable; urgency=low
+
+ * Add accent on my name in debian/control.
+ * Change build-depends on python-dev to python.
+ * Switch to source format "3.0 (quilt)".
+ * Switch to debhelper 7 tiny rules file and compat mode 7.
+ * Upgrade Standards-Version to 3.8.3.
+ * Dropped useless debian/pycompat.
+ * Add missing ${misc:Depends} on Depends line.
+ * Register documentation with doc-base.
+
+ -- Raphaël Hertzog <hertzog at debian.org> Wed, 27 Jan 2010 16:09:24 +0100
+
+python-django-registration (0.7-1) unstable; urgency=low
+
+ [ Sandro Tosi ]
+ * debian/control
+ - switch Vcs-Browser field to viewsvn
+
+ [ Stephan Peijnik ]
+ * New upstream release.
+ * Updated debian/watch to use pypi.python.org as source of new upstream
+ tarballs.
+
+ [ Raphael Hertzog ]
+ * Update URL in Homepage field to match new upstream site (it moved to
+ Bitbucket).
+ * Drop 02_overview_rst_fix.patch and 01_validators_removed.patch as they got
+ merged upstream.
+ * delete_expired_users.py does no more exist. It has been replaced with a
+ manage.py sub-command (manage.py cleanupregistration) that you can invoke
+ within any project using django-registration.
+ * Drop .po files from binary package.
+
+ -- Raphael Hertzog <hertzog at debian.org> Wed, 12 Nov 2008 10:06:06 +0100
+
+python-django-registration (0.6-3) unstable; urgency=low
+
+ * Modified package to use quilt patchsys (requested by Raphael Hertzog).
+ * Added myself to Uploaders.
+ * Moved package to unstable, as it is compatible with the version of
+ python-django in unstable.
+ * debian/control:
+ - Updated dependency on python-django (>= 1.0).
+ - Removed Prority: optional from binary package.
+ * debian/rules:
+ - Removed simple-patchsys.mk from includes.
+ - Added patchsys-quilt.mk to includes.
+ - Made clean target depend on unpatch.
+ * debian/patches/01_validators_removed.patch:
+ - Pulled in bugfixes in revisions 167 and 168 from upstream SVN.
+ This patch fixes the bug introduced by the removal of
+ django.core.validators in python-django 1.0-1. (Closes: #498086)
+ * debian/patches/02_overview_rst_fix.patch:
+ - Fixes a typo in overview.txt causing rst2html to return an error.
+ * Moved delete_expired_users.py script out of site-packages into
+ /usr/share/doc/python-django-registration/examples.
+ * Added debian/python-django-registration.README.Debian to document
+ the delete_expired_users.py change.
+ * Documented patches in debian/patches.
+
+ -- Stephan Peijnik <debian at sp.or.at> Tue, 16 Sep 2008 12:06:09 +0200
+
+python-django-registration (0.6-2) experimental; urgency=low
+
+ * debian/control:
+ - added dependency on python-django (>= 1.0~beta1) (Thanks to Raphael
+ Hertzog).
+ * debian/rules:
+ - added call to new compile-messages interface through django-admin.
+ - remove ._django.po during clean.
+
+ -- David Spreen <netzwurm at debian.org> Fri, 22 Aug 2008 12:32:04 -0700
+
+python-django-registration (0.6-1) experimental; urgency=low
+
+ [ Sandro Tosi ]
+ * debian/watch
+ - fixed to work with code.google.com
+
+ [ David Spreen ]
+ * New upstream SVN snapshot to ensure compatibility with upcoming 1.0
+ release of python-django.
+ * debian/rules
+ - Removed the call to compile-messages since it requires
+ experimental django version. This will be added again once
+ Django 1.0 enters sid.
+ * debian/control:
+ - Removed build-dependency on python-django. See above.
+ - Depend on python-django (>= 1.0~beta1).
+ - Updated policy version.
+
+ -- David Spreen <netzwurm at debian.org> Thu, 21 Aug 2008 17:39:12 -0700
+
+python-django-registration (0.4p2-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Raphael Hertzog <hertzog at debian.org> Sun, 02 Mar 2008 12:26:25 +0100
+
+python-django-registration (0.4p1-1) experimental; urgency=low
+
+ [ Sandro Tosi ]
+ * debian/control
+ - uniforming Vcs-Browser field
+
+ [ Raphael Hertzog ]
+ * New upstream release.
+ * Updated Standards-Version to 3.7.3 (no change).
+ * Fix dependency on python-django to really require the experimental
+ version. Closes: #460413
+ * Move python-django, python-docutils and python-support from Build-Depends
+ to Build-Depends-Indep as they are not needed during cleanup.
+
+ -- Raphael Hertzog <hertzog at debian.org> Sat, 12 Jan 2008 15:58:38 +0100
+
+python-django-registration (0.3p5-1) experimental; urgency=low
+
+ * New upstream release.
+ * Drop debian/patches/01_fix_setup_py.patch which got integrated upstream.
+ * Generate HTML for new (rst) documentation files.
+
+ -- Raphael Hertzog <hertzog at debian.org> Mon, 08 Oct 2007 16:43:19 +0200
+
+python-django-registration (0.3p3-1) experimental; urgency=low
+
+ [ Piotr Ożarowski ]
+ * XS-Vcs-Browser and Homepage fields added
+
+ [ Raphael Hertzog ]
+ * New upstream release.
+ * Renamed XS-Vcs* to Vcs-* since they are supported by dpkg now.
+ * debian/patches/01_fix_setup_py.patch: Make sure that non *.py files
+ like translations are also included. (patch forwarded upstream)
+ * Compile translations into *.mo files with the django's make-messages.py.
+ Build-Depends on python-django for this.
+
+ -- Raphael Hertzog <hertzog at debian.org> Thu, 04 Oct 2007 18:23:37 +0200
+
+python-django-registration (0.2-1) experimental; urgency=low
+
+ * Initial release.
+ * Upload to experimental because it requires the development version
+ of python-django.
+
+ -- Raphael Hertzog <hertzog at debian.org> Tue, 31 Jul 2007 15:10:52 +0200
Copied: packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/django-1.7-compat.patch (from rev 30062, packages/python-django-registration/trunk/debian/patches/django-1.7-compat.patch)
===================================================================
--- packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/django-1.7-compat.patch (rev 0)
+++ packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/django-1.7-compat.patch 2014-08-06 22:05:15 UTC (rev 30063)
@@ -0,0 +1,58 @@
+Description: Fix for Django 1.7
+ With Django 1.7, the call to get_user_model() triggers
+ django.core.exceptions.AppRegistryNotReady: Models aren't loaded yet.
+Author: Victor Bornov
+Origin: other, https://bitbucket.org/bornov/django-registration/commits/3c1810ac88aad1569d0a288636803f93fef0b42c
+Bug: https://bitbucket.org/ubernostrum/django-registration/pull-request/88/made-call-to-user-lazy-for-django-17-app/diff
+Bug-Debian: http://bugs.debian.org/755653
+Last-Update: 2014-08-06
+
+diff --git a/registration/models.py b/registration/models.py
+--- a/registration/models.py
++++ b/registration/models.py
+@@ -4,17 +4,12 @@
+ import re
+
+ from django.conf import settings
+-from django.contrib.auth.models import User
+ from django.db import models
+ from django.db import transaction
+ from django.template.loader import render_to_string
+ from django.utils.translation import ugettext_lazy as _
++from django.contrib.auth import get_user_model
+
+-try:
+- from django.contrib.auth import get_user_model
+- User = get_user_model()
+-except ImportError:
+- from django.contrib.auth.models import User
+
+ try:
+ from django.utils.timezone import now as datetime_now
+@@ -81,6 +76,8 @@
+ user. To disable this, pass ``send_email=False``.
+
+ """
++ User = get_user_model()
++
+ new_user = User.objects.create_user(username, email, password)
+ new_user.is_active = False
+ new_user.save()
+@@ -151,6 +148,8 @@
+ be deleted.
+
+ """
++ User = get_user_model()
++
+ for profile in self.all():
+ try:
+ if profile.activation_key_expired():
+@@ -179,7 +178,7 @@
+ """
+ ACTIVATED = u"ALREADY_ACTIVATED"
+
+- user = models.ForeignKey(User, unique=True, verbose_name=_('user'))
++ user = models.ForeignKey(settings.AUTH_USER_MODEL, unique=True, verbose_name=_('user'))
+ activation_key = models.CharField(_('activation key'), max_length=40)
+
+ objects = RegistrationManager()
Copied: packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/fix-test-suite.patch (from rev 30062, packages/python-django-registration/trunk/debian/patches/fix-test-suite.patch)
===================================================================
--- packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/fix-test-suite.patch (rev 0)
+++ packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/fix-test-suite.patch 2014-08-06 22:05:15 UTC (rev 30063)
@@ -0,0 +1,112 @@
+Description: Fix the test suite
+ Add files required to run the test suite and also
+ fix some problems in the test suite.
+Author: Raphaël Hertzog <hertzog at debian.org>
+Origin: vendor
+Last-Update: 2014-08-06
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format.
+--- /dev/null
++++ b/registration/tests/settings.py
+@@ -0,0 +1,33 @@
++import os
++
++SECRET_KEY = 'auieanuisetnauisetnauitseauieauie'
++
++SITE_ID = 1
++
++DATABASES = {
++ 'default': {
++ 'ENGINE': 'django.db.backends.sqlite3',
++ 'NAME': 'test.db',
++ }
++}
++
++INSTALLED_APPS = (
++ 'django.contrib.sites',
++ 'django.contrib.contenttypes',
++ 'django.contrib.auth',
++ 'django.contrib.sessions',
++ 'registration',
++)
++
++ROOT_URLCONF = 'registration.tests.urls'
++
++TEMPLATE_DIRS = (
++ os.path.join(os.path.dirname(__file__), 'templates'),
++)
++
++ACCOUNT_ACTIVATION_DAYS = 7
++
++MIDDLEWARE_CLASSES = (
++ 'django.contrib.sessions.middleware.SessionMiddleware',
++ 'django.contrib.auth.middleware.AuthenticationMiddleware',
++)
+--- a/registration/tests/default_backend.py
++++ b/registration/tests/default_backend.py
+@@ -195,4 +195,4 @@ class DefaultBackendViewTests(TestCase):
+
+ self.assertEqual(200, resp.status_code)
+ self.assertTemplateUsed(resp, 'registration/activate.html')
+- self.failIf('activation_key' in resp.context)
++ self.assertTrue('activation_key' in resp.context)
+--- a/registration/tests/models.py
++++ b/registration/tests/models.py
+@@ -1,5 +1,6 @@
+ import datetime
+ import re
++import hashlib
+
+ from django.conf import settings
+ from django.contrib.auth.models import User
+@@ -7,7 +8,6 @@ from django.contrib.sites.models import
+ from django.core import mail
+ from django.core import management
+ from django.test import TestCase
+-from django.utils.hashcompat import sha_constructor
+
+ from registration.models import RegistrationProfile
+
+@@ -183,7 +183,7 @@ class RegistrationModelTests(TestCase):
+ """
+ # Due to the way activation keys are constructed during
+ # registration, this will never be a valid key.
+- invalid_key = sha_constructor('foo').hexdigest()
++ invalid_key = hashlib.sha1('foo').hexdigest()
+ self.failIf(RegistrationProfile.objects.activate_user(invalid_key))
+
+ def test_expired_user_deletion(self):
+--- /dev/null
++++ b/registration/tests/templates/registration/activation_complete.html
+@@ -0,0 +1 @@
++Yay!
+--- /dev/null
++++ b/registration/tests/templates/registration/activate.html
+@@ -0,0 +1 @@
++Too bad. Bad key. {{ activation_key }}
+--- /dev/null
++++ b/registration/tests/templates/registration/activation_email_subject.txt
+@@ -0,0 +1 @@
++Click here to confirm: {{ activation_key }}
+--- /dev/null
++++ b/registration/tests/templates/registration/registration_form.html
+@@ -0,0 +1,5 @@
++<html>
++<body>
++ {{ form }}
++</body>
++</html>
+--- /dev/null
++++ b/registration/tests/templates/registration/activation_email.txt
+@@ -0,0 +1 @@
++Click here to confirm: {{ activation_key }}
+--- /dev/null
++++ b/registration/tests/templates/registration/registration_complete.html
+@@ -0,0 +1 @@
++Yay!
+--- /dev/null
++++ b/registration/tests/templates/registration/registration_closed.html
+@@ -0,0 +1 @@
++No registration, sorry.
Copied: packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/more-django-1.7-fixes.patch (from rev 30062, packages/python-django-registration/trunk/debian/patches/more-django-1.7-fixes.patch)
===================================================================
--- packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/more-django-1.7-fixes.patch (rev 0)
+++ packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/more-django-1.7-fixes.patch 2014-08-06 22:05:15 UTC (rev 30063)
@@ -0,0 +1,91 @@
+Description: More test suite fixes for Django 1.7
+Author: Raphaël Hertzog <hertzog at debian.org>
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/755653
+Last-Update: 2014-08-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/registration/backends/simple/urls.py
++++ b/registration/backends/simple/urls.py
+@@ -32,5 +32,8 @@ urlpatterns = patterns('',
+ url(r'^register/closed/$',
+ TemplateView.as_view(template_name='registration/registration_closed.html'),
+ name='registration_disallowed'),
++ url(r'^register/complete/$',
++ TemplateView.as_view(template_name='registration/registration_complete.html'),
++ name='registration_complete'),
+ (r'', include('registration.auth_urls')),
+ )
+--- a/registration/backends/simple/views.py
++++ b/registration/backends/simple/views.py
+@@ -42,4 +42,4 @@ class RegistrationView(BaseRegistrationV
+ return getattr(settings, 'REGISTRATION_OPEN', True)
+
+ def get_success_url(self, request, user):
+- return (user.get_absolute_url(), (), {})
++ return ('registration_complete', (), {})
+--- a/registration/tests/default_backend.py
++++ b/registration/tests/default_backend.py
+@@ -6,6 +6,10 @@ from django.contrib.sites.models import
+ from django.core import mail
+ from django.core.urlresolvers import reverse
+ from django.test import TestCase
++try:
++ from django.test.utils import override_settings
++except:
++ from django.test import override_settings
+
+ from registration import signals
+ from registration.admin import RegistrationAdmin
+@@ -113,15 +117,24 @@ class DefaultBackendViewTests(TestCase):
+ self.assertEqual(RegistrationProfile.objects.count(), 1)
+ self.assertEqual(len(mail.outbox), 1)
+
++ @override_settings(INSTALLED_APPS=
++ ('django.contrib.contenttypes',
++ 'django.contrib.auth',
++ 'django.contrib.sessions',
++ 'registration',))
+ def test_registration_no_sites(self):
+ """
+ Registration still functions properly when
+ ``django.contrib.sites`` is not installed; the fallback will
+ be a ``RequestSite`` instance.
+-
+- """
+- Site._meta.installed = False
+
++ """
++ try:
++ # Django 1.7 does it correctly
++ self.assertFalse(Site._meta.installed)
++ except:
++ # For older versions we fake it and restore it at the end
++ Site._meta.installed = False
+ resp = self.client.post(reverse('registration_register'),
+ data={'username': 'bob',
+ 'email': 'bob at example.com',
+@@ -139,7 +152,11 @@ class DefaultBackendViewTests(TestCase):
+ self.assertEqual(RegistrationProfile.objects.count(), 1)
+ self.assertEqual(len(mail.outbox), 1)
+
+- Site._meta.installed = True
++ try:
++ # Raises an exception with Django 1.7 as attribute is read-only
++ Site._meta.installed = True
++ except AttributeError:
++ pass
+
+ def test_registration_failure(self):
+ """
+--- a/registration/tests/simple_backend.py
++++ b/registration/tests/simple_backend.py
+@@ -63,7 +63,7 @@ class SimpleBackendViewTests(TestCase):
+
+ new_user = User.objects.get(username='bob')
+ self.assertEqual(302, resp.status_code)
+- self.failUnless(new_user.get_absolute_url() in resp['Location'])
++ self.failUnless(reverse('registration_complete') in resp['Location'])
+
+ self.failUnless(new_user.check_password('secret'))
+ self.assertEqual(new_user.email, 'bob at example.com')
Deleted: packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/series
===================================================================
--- packages/python-django-registration/trunk/debian/patches/series 2014-08-06 11:41:33 UTC (rev 30061)
+++ packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/series 2014-08-06 22:05:15 UTC (rev 30063)
@@ -1 +0,0 @@
-send_signal_only_once_when_activating_user.patch
Copied: packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/series (from rev 30062, packages/python-django-registration/trunk/debian/patches/series)
===================================================================
--- packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/series (rev 0)
+++ packages/python-django-registration/tags/1.0+dfsg-2/debian/patches/series 2014-08-06 22:05:15 UTC (rev 30063)
@@ -0,0 +1,4 @@
+send_signal_only_once_when_activating_user.patch
+fix-test-suite.patch
+django-1.7-compat.patch
+more-django-1.7-fixes.patch
Deleted: packages/python-django-registration/tags/1.0+dfsg-2/debian/rules
===================================================================
--- packages/python-django-registration/trunk/debian/rules 2014-08-06 11:41:33 UTC (rev 30061)
+++ packages/python-django-registration/tags/1.0+dfsg-2/debian/rules 2014-08-06 22:05:15 UTC (rev 30063)
@@ -1,20 +0,0 @@
-#!/usr/bin/make -f
-
-PKG = $(shell dh_listpackages)
-
-%:
- dh $@ --with python2,sphinxdoc
-
-override_dh_auto_clean:
- rm -rf docs/_build/
- dh_auto_clean
-
-override_dh_auto_build:
- cd registration && /usr/bin/django-admin compilemessages
- cd docs && $(MAKE) html
- dh_auto_build
-
-override_dh_auto_install:
- dh_auto_install
- # Drop .po files and keep only .mo files (compiled)
- find debian/$(PKG)/ -name '*.po' -exec rm {} \;
Copied: packages/python-django-registration/tags/1.0+dfsg-2/debian/rules (from rev 30062, packages/python-django-registration/trunk/debian/rules)
===================================================================
--- packages/python-django-registration/tags/1.0+dfsg-2/debian/rules (rev 0)
+++ packages/python-django-registration/tags/1.0+dfsg-2/debian/rules 2014-08-06 22:05:15 UTC (rev 30063)
@@ -0,0 +1,23 @@
+#!/usr/bin/make -f
+
+PKG = $(shell dh_listpackages)
+
+%:
+ dh $@ --with python2,sphinxdoc
+
+override_dh_auto_clean:
+ rm -rf docs/_build/
+ dh_auto_clean
+
+override_dh_auto_build:
+ cd registration && /usr/bin/django-admin compilemessages
+ cd docs && $(MAKE) html
+ dh_auto_build
+
+override_dh_auto_install:
+ dh_auto_install
+ # Drop .po files and keep only .mo files (compiled)
+ find debian/$(PKG)/ -name '*.po' -exec rm {} \;
+
+override_dh_auto_test:
+ PYTHONPATH=. DJANGO_SETTINGS_MODULE=registration.tests.settings python /usr/bin/django-admin test registration.tests
More information about the Python-modules-commits
mailing list