From fb6e1118dbb37a82a2f3a366c3803b876f1a68a9 Mon Sep 17 00:00:00 2001 From: Venelin Stoykov Date: Wed, 15 Jun 2016 16:54:07 +0300 Subject: [PATCH] Simplify SortableAdmin.get_urls Preserve compatibility --- adminsortable/admin.py | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/adminsortable/admin.py b/adminsortable/admin.py index 303d846..bb53926 100755 --- a/adminsortable/admin.py +++ b/adminsortable/admin.py @@ -4,12 +4,11 @@ from django import VERSION from django.conf import settings -if VERSION > (1, 7): +try: from django.conf.urls import url -elif VERSION > (1, 5): - from django.conf.urls import patterns, url -else: - from django.conf.urls.defaults import patterns, url +except ImportError: + # Django < 1.4 + from django.conf.urls.defaults import url from django.contrib.admin import ModelAdmin, TabularInline, StackedInline from django.contrib.admin.options import InlineModelAdmin @@ -94,17 +93,11 @@ class SortableAdmin(SortableAdminBase, ModelAdmin): self.admin_site.admin_view(self.sort_view), name='admin_sort') - if VERSION > (1, 7): - admin_urls = [ - admin_do_sorting_url, - admin_sort_url - ] - else: - admin_urls = patterns('', - admin_do_sorting_url, - admin_sort_url,) - - return admin_urls + urls + urls = [ + admin_do_sorting_url, + admin_sort_url + ] + urls + return urls def sort_view(self, request): """