Fix django-ordered-model#73: Remove usage of deprecated django.conf.u…

…rls.patterns.
timgraham · Feb 9, 2016 · 818f505 · 818f505
1 parent 09463d4
commit 818f505
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/ordered_model/admin.py b/ordered_model/admin.py
@@ -1,6 +1,7 @@
 from functools import update_wrapper
 
 # from django.conf import settings
+from django.conf.urls import url
 from django.core.paginator import Paginator
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
@@ -18,19 +19,17 @@
 
 class OrderedModelAdmin(admin.ModelAdmin):
     def get_urls(self):
-        from django.conf.urls import patterns, url
-
         def wrap(view):
             def wrapper(*args, **kwargs):
                 return self.admin_site.admin_view(view)(*args, **kwargs)
             return update_wrapper(wrapper, view)
-        return patterns('',
+        return [
             url(r'^(.+)/move-(up)/$', wrap(self.move_view),
                 name='{app}_{model}_order_up'.format(**self._get_model_info())),
 
             url(r'^(.+)/move-(down)/$', wrap(self.move_view),
                 name='{app}_{model}_order_down'.format(**self._get_model_info())),
-            ) + super(OrderedModelAdmin, self).get_urls()
+            ] + super(OrderedModelAdmin, self).get_urls()
 
     def _get_changelist(self, request):
         list_display = self.get_list_display(request)
@@ -118,13 +117,12 @@ def wrap(view):
             def wrapper(*args, **kwargs):
                 return model_admin.admin_site.admin_view(view)(*args, **kwargs)
             return update_wrapper(wrapper, view)
-        return patterns('',
-                        url(r'^(.+)/{model}/(.+)/move-(up)/$'.format(**cls.get_model_info()), wrap(cls.move_view),
-                            name='{app}_{model}_order_up_inline'.format(**cls.get_model_info())),
-
-                        url(r'^(.+)/{model}/(.+)/move-(down)/$'.format(**cls.get_model_info()), wrap(cls.move_view),
-                            name='{app}_{model}_order_down_inline'.format(**cls.get_model_info())),
-                        ) # + super(OrderedTabularInline, cls).get_urls()
+        return [
+            url(r'^(.+)/{model}/(.+)/move-(up)/$'.format(**cls.get_model_info()), wrap(cls.move_view),
+                name='{app}_{model}_order_up_inline'.format(**cls.get_model_info())),
+            url(r'^(.+)/{model}/(.+)/move-(down)/$'.format(**cls.get_model_info()), wrap(cls.move_view),
+                name='{app}_{model}_order_down_inline'.format(**cls.get_model_info())),
+        ]
 
     @classmethod
     def get_list_display(cls, request):
@@ -281,4 +279,3 @@ def move_up_down_links(self, obj):
             return ''
     move_up_down_links.allow_tags = True
     move_up_down_links.short_description = _(u'Move')
-
diff --git a/ordered_model/tests/urls.py b/ordered_model/tests/urls.py
@@ -6,6 +6,6 @@
 
 admin.autodiscover()
 
-urlpatterns = patterns('',
+urlpatterns = [
     (r'^admin/', include(admin.site.urls)),
-)
+]