[Python-modules-commits] [python-django-registration] 10/11: merge patched into master

[Stephan Suerken]

This is an automated email from the git hooks/post-receive script.

absurd pushed a commit to branch master
in repository python-django-registration.

commit f02a444ef25a80a80af735e733bcec08605128da
Merge: f7c145d bc4a9ed
Author: Stephan Sürken <absurd at debian.org>
Date:   Fri Jul 29 18:58:52 2016 +0000

    merge patched into master

 debian/.git-dpm                                    |  6 +--
 ...end_signal_only_once_when_activating_user.patch |  2 +-
 debian/patches/series                              |  1 +
 ...ate_django_runtest_settings_for_django110.patch | 45 ++++++++++++++++++++++
 registration/runtests.py                           | 22 +++++++++--
 5 files changed, 69 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index ea2ca1c,0000000..92abee1
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- a005f974538796ec396ef36fdbf01ac1399a48ad
- a005f974538796ec396ef36fdbf01ac1399a48ad
- 4041fb4895e19e0a0e4a84086c011ee87e9a5a54
++bc4a9ede0f8e5fdecb7a5b38f36bb8f474cc5cc9
++bc4a9ede0f8e5fdecb7a5b38f36bb8f474cc5cc9
++1cbf9c52c94c46ad9dbd91dda7607a8a64d74019
 +1cbf9c52c94c46ad9dbd91dda7607a8a64d74019
 +python-django-registration_2.1.2.orig.tar.gz
 +7e705ed300c81d4ba0fc10615481457e4e78f365
 +70068
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/send_signal_only_once_when_activating_user.patch
index b434347,0000000..59a46e4
mode 100644,000000..100644
--- a/debian/patches/send_signal_only_once_when_activating_user.patch
+++ b/debian/patches/send_signal_only_once_when_activating_user.patch
@@@ -1,40 -1,0 +1,40 @@@
- From a005f974538796ec396ef36fdbf01ac1399a48ad Mon Sep 17 00:00:00 2001
++From 481661ce4f27fd443f46c5ad9e4a8c7e1606795c Mon Sep 17 00:00:00 2001
 +From: Tomaz Muraus <Tomaz Muraus>
 +Date: Thu, 8 Oct 2015 11:50:26 -0700
 +Subject: Fixes double signal sending when activating user.
 +
 + The patch can't be submitted upstream as there's no clear upstream
 + maintainer currently.
 +Origin: other, https://bitbucket.org/kami/django-registration/commits/6a0aff33bcf2cc24190916c74bc1b6822622d45a
 +Bug-Debian: http://bugs.debian.org/745756
 +Last-Update: 2014-05-27
 +
 +Patch-Name: send_signal_only_once_when_activating_user.patch
 +---
 + registration/views.py | 6 ------
 + 1 file changed, 6 deletions(-)
 +
 +diff --git a/registration/views.py b/registration/views.py
 +index 0f4e6e3..e969045 100644
 +--- a/registration/views.py
 ++++ b/registration/views.py
 +@@ -8,7 +8,6 @@ from django.shortcuts import redirect
 + from django.views.generic.base import TemplateView
 + from django.views.generic.edit import FormView
 + 
 +-from registration import signals
 + from registration.forms import RegistrationForm
 + 
 + 
 +@@ -99,11 +98,6 @@ class ActivationView(TemplateView):
 +         """
 +         activated_user = self.activate(*args, **kwargs)
 +         if activated_user:
 +-            signals.user_activated.send(
 +-                sender=self.__class__,
 +-                user=activated_user,
 +-                request=self.request
 +-            )
 +             success_url = self.get_success_url(activated_user)
 +             try:
 +                 to, args, kwargs = success_url
diff --cc debian/patches/series
index 0de6a4b,0000000..7d7c5b7
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +send_signal_only_once_when_activating_user.patch
++update_django_runtest_settings_for_django110.patch
diff --cc debian/patches/update_django_runtest_settings_for_django110.patch
index 0000000,0000000..992a1ed
new file mode 100644
--- /dev/null
+++ b/debian/patches/update_django_runtest_settings_for_django110.patch
@@@ -1,0 -1,0 +1,45 @@@
++From bc4a9ede0f8e5fdecb7a5b38f36bb8f474cc5cc9 Mon Sep 17 00:00:00 2001
++From: =?utf-8?q?Stephan=20S=C3=BCrken?= <absurd at debian.org>
++Date: Fri, 29 Jul 2016 17:39:48 +0000
++Subject: Update django runtest settings for django 1.10 (works >= 1.8).
++
++Bug-Debian: http://bugs.debian.org/828672
++
++Patch-Name: update_django_runtest_settings_for_django110.patch
++---
++ registration/runtests.py | 22 +++++++++++++++++++---
++ 1 file changed, 19 insertions(+), 3 deletions(-)
++
++diff --git a/registration/runtests.py b/registration/runtests.py
++index 1f5755e..93103be 100644
++--- a/registration/runtests.py
+++++ b/registration/runtests.py
++@@ -42,9 +42,25 @@ SETTINGS_DICT = {
++         'django.contrib.auth.middleware.AuthenticationMiddleware',
++     ),
++     'SITE_ID': 1,
++-    'TEMPLATE_DIRS': (
++-        os.path.join(APP_DIR, 'tests/templates'),
++-    ),
+++    'TEMPLATES': [
+++        {
+++            'BACKEND': 'django.template.backends.django.DjangoTemplates',
+++            'DIRS': [ os.path.join(APP_DIR, 'tests/templates') ],
+++            'OPTIONS': {
+++                'context_processors': [
+++                    # Insert your TEMPLATE_CONTEXT_PROCESSORS here or use this
+++                    # list if you haven't customized them:
+++                    'django.contrib.auth.context_processors.auth',
+++                    'django.template.context_processors.debug',
+++                    'django.template.context_processors.i18n',
+++                    'django.template.context_processors.media',
+++                    'django.template.context_processors.static',
+++                    'django.template.context_processors.tz',
+++                    'django.contrib.messages.context_processors.messages',
+++                ],
+++            },
+++        },
+++    ],
++ }
++ 
++ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django-registration.git