[Python-modules-commits] [django-celery] 04/05: merge patched into master

[Thomas Goirand]

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

zigo pushed a commit to branch master
in repository django-celery.

commit f25c657f6f6d2186c1712f28e05fcbcf610a03f2
Merge: a810008 36d40e5
Author: Thomas Goirand <zigo at debian.org>
Date:   Tue Aug 2 22:31:11 2016 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...-fix-django.conf.urls.patterns-is-removed.patch | 68 ++++++++++++++++++++++
 .../0008-django-1.10-fix-import-error.patch        | 24 --------
 debian/patches/series                              |  2 +-
 djcelery/urls.py                                   | 10 +---
 tests/urls.py                                      |  7 +--
 6 files changed, 77 insertions(+), 38 deletions(-)

diff --cc debian/.git-dpm
index 9225bdf,0000000..29e1e2f
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
- b5675921b1452d1da6091d0a47d1c369dd72946e
- b5675921b1452d1da6091d0a47d1c369dd72946e
++36d40e547b095a2979da7ef5883d84ea90a48cdf
++36d40e547b095a2979da7ef5883d84ea90a48cdf
 +58751dd4216a267ccad1f8b5932487c51af036e4
 +58751dd4216a267ccad1f8b5932487c51af036e4
 +django-celery_3.1.17.orig.tar.gz
 +64ca723de395f66decb5563e037c094ed723e45b
 +79615
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0008-django-1.10-fix-django.conf.urls.patterns-is-removed.patch
index 0000000,0000000..5d80af8
new file mode 100644
--- /dev/null
+++ b/debian/patches/0008-django-1.10-fix-django.conf.urls.patterns-is-removed.patch
@@@ -1,0 -1,0 +1,68 @@@
++From 36d40e547b095a2979da7ef5883d84ea90a48cdf Mon Sep 17 00:00:00 2001
++From: Thomas Goirand <zigo at debian.org>
++Date: Tue, 2 Aug 2016 22:30:22 +0000
++Subject: django 1.10 fix django.conf.urls.patterns() is removed
++
++---
++ djcelery/urls.py | 10 +++-------
++ tests/urls.py    | 12 +++---------
++ 2 files changed, 6 insertions(+), 16 deletions(-)
++
++diff --git a/djcelery/urls.py b/djcelery/urls.py
++index b6e5cad..2178bdd 100644
++--- a/djcelery/urls.py
+++++ b/djcelery/urls.py
++@@ -13,20 +13,16 @@ URLs defined for celery.
++ """
++ from __future__ import absolute_import, unicode_literals
++ 
++-try:
++-    from django.conf.urls import patterns, url
++-except ImportError:  # deprecated since Django 1.4
++-    from django.conf.urls.defaults import patterns, url  # noqa
+++from django.conf.urls import url
++ 
++ from . import views
++ 
++ task_pattern = r'(?P<task_id>[\w\d\-\.]+)'
++ 
++-urlpatterns = patterns(
++-    '',
+++urlpatterns = [
++     url(r'^%s/done/?$' % task_pattern, views.is_task_successful,
++         name='celery-is_task_successful'),
++     url(r'^%s/status/?$' % task_pattern, views.task_status,
++         name='celery-task_status'),
++     url(r'^tasks/?$', views.registered_tasks, name='celery-tasks'),
++-)
+++]
++diff --git a/tests/urls.py b/tests/urls.py
++index 9d72f70..b8ab1c4 100644
++--- a/tests/urls.py
+++++ b/tests/urls.py
++@@ -1,17 +1,11 @@
++-try:
++-    from django.conf.urls import (patterns, include, url,
++-                                  handler500, handler404)
++-except ImportError:
++-    from django.conf.urls.defaults import (patterns, include, url,  # noqa
++-                                  handler500, handler404)
+++from django.conf.urls import (include, url, handler500, handler404)
++ from djcelery.views import apply
++ 
++ # Uncomment the next two lines to enable the admin:
++ # from django.contrib import admin
++ # admin.autodiscover()
++ 
++-urlpatterns = patterns(
++-    '',
+++urlpatterns = [
++     # Example:
++     # (r'^tests/', include('tests.foo.urls')),
++ 
++@@ -24,4 +18,4 @@ urlpatterns = patterns(
++     url(r'^apply/(?P<task_name>.+?)/', apply, name='celery-apply'),
++     url(r'^celery/', include('djcelery.urls')),
++ 
++-)
+++]
diff --cc debian/patches/series
index 1805940,0000000..f115bcd
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,0 +1,8 @@@
 +fix_dependencies.patch
 +no-issues.patch
 +fix_autodiscover.patch
 +privacy.patch
 +0005-Fix-python3-issues.patch
 +0006-Fix-caching-with-Django-1.9.patch
 +0007-Fix-get_model-with-Django-1.9.patch
- 0008-django-1.10-fix-import-error.patch
++0008-django-1.10-fix-django.conf.urls.patterns-is-removed.patch

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