fix: cleanup Django compatibility shims for <2.0 (#126)

Author: browniebroke

django_object_actions/tests/test_admin.py

@@ -3,13 +3,9 @@
 """
 from django.contrib.admin.utils import quote
 from django.http import HttpResponse
+from django.urls import reverse
 from unittest.mock import patch
 
-try:
-    from django.urls import reverse
-except ImportError:
-    from django.core.urlresolvers import reverse  # < DJANGO1.10
-
 from .tests import LoggedInTestCase
 from example_project.polls.factories import (
     CommentFactory,

django_object_actions/tests/test_urls.py

@@ -1,10 +1,7 @@
 """
 Integration tests
 """
-try:
-    from django.urls import reverse
-except ImportError:
-    from django.core.urlresolvers import reverse  # < DJANGO1.10
+from django.urls import reverse
 
 from .tests import LoggedInTestCase
 

django_object_actions/tests/tests.py

@@ -1,7 +1,4 @@
-try:
-    from django.urls import reverse
-except ImportError:
-    from django.core.urlresolvers import reverse  # < DJANGO1.10
+from django.urls import reverse
 from django.test import TestCase
 
 from example_project.polls.factories import UserFactory

django_object_actions/utils.py

@@ -9,16 +9,7 @@
 from django.views.generic import View
 from django.views.generic.detail import SingleObjectMixin
 from django.views.generic.list import MultipleObjectMixin
-
-try:
-    from django.urls import re_path
-except ImportError:
-    from django.conf.urls import url as re_path  # DJANGO1.11
-
-try:
-    from django.urls import reverse
-except ImportError:
-    from django.core.urlresolvers import reverse  # DJANGO1.10
+from django.urls import re_path, reverse
 
 
 class BaseDjangoObjectActions(object):

example_project/polls/admin.py

@@ -2,11 +2,7 @@
 from django.contrib.admin import AdminSite
 from django.db.models import F
 from django.http import HttpResponseRedirect
-
-try:
-    from django.urls import reverse
-except ImportError:
-    from django.core.urlresolvers import reverse  # < DJANGO1.10
+from django.urls import reverse
 
 from django_object_actions import DjangoObjectActions, takes_instance_or_queryset
 

example_project/urls.py

@@ -1,18 +1,10 @@
 from django import VERSION
-from django.conf.urls import url
+from django.urls import include, path
 from django.contrib import admin
 from example_project.polls.admin import support_admin
 
-if VERSION[0] == 1 and VERSION[1] <= 8:
-    from django.conf.urls import include
-else:
-    # DJANGO1.9
-    # https://docs.djangoproject.com/en/2.0/releases/1.9/#passing-a-3-tuple-or-an-app-name-to-include
-    def include(urls):
-        return urls
-
 
 urlpatterns = [
-    url(r"^admin/", include(admin.site.urls)),
-    url(r"^support/", include(support_admin.urls)),
+    path("admin/", admin.site.urls),
+    path("support/", support_admin.urls),
 ]