Merge pull request #140 from MagicSolutions/cleanup/admin-urls

Simplify `SortableAdmin.get_urls`

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):
+except ImportError:
-    from django.conf.urls import patterns, url
+    # Django < 1.4
-else:
+    from django.conf.urls.defaults import url
-    from django.conf.urls.defaults import patterns, 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):
+        urls = [
-            admin_urls = [
             admin_do_sorting_url,
             admin_sort_url
-            ]
+        ] + urls
-        else:
+        return urls
-            admin_urls = patterns('',
-                admin_do_sorting_url,
-                admin_sort_url,)
-
-        return admin_urls + urls
 
     def sort_view(self, request):
         """