[Python-modules-commits] [django-celery] 03/05: django 1.10 fix django.conf.urls.patterns() is removed

[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 36d40e547b095a2979da7ef5883d84ea90a48cdf
Author: Thomas Goirand <zigo at debian.org>
Date:   Tue Aug 2 22:30:22 2016 +0000

    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')),
 
-)
+]

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