diff --git a/object_tools/options.py b/object_tools/options.py index 511b780..2176b04 100644 --- a/object_tools/options.py +++ b/object_tools/options.py @@ -2,15 +2,12 @@ from django import forms from django.conf import settings -from django.conf.urls import url +from django.urls import re_path from django.contrib.admin import helpers from django.core.exceptions import PermissionDenied from django.utils.decorators import method_decorator from django.views.decorators.csrf import csrf_protect -try: - from django.urls import reverse -except ImportError: - from django.core.urlresolvers import reverse +from django.urls import reverse csrf_protect_m = method_decorator(csrf_protect) @@ -102,7 +99,7 @@ def _urls(self): self.name, ) urlpatterns = [ - url(r'^%s/$' % self.name, self._view, name='%s_%s_%s' % info) + re_path(r'^%s/$' % self.name, self._view, name='%s_%s_%s' % info) ] return urlpatterns urls = property(_urls) diff --git a/object_tools/sites.py b/object_tools/sites.py index fd56d93..f1b4399 100644 --- a/object_tools/sites.py +++ b/object_tools/sites.py @@ -68,7 +68,7 @@ def get_urls(self): try: from django.conf.urls.defaults import url, include except ImportError: - from django.conf.urls import url, include + from django.urls import include, re_path urlpatterns = [] @@ -83,7 +83,7 @@ def get_urls(self): for object_tool in object_tools: urlpatterns.append( - url(r'^%s/%s/' % info, include(object_tool.urls)) + re_path(r'^%s/%s/' % info, include(object_tool.urls)) ) return urlpatterns diff --git a/object_tools/tests/urls.py b/object_tools/tests/urls.py index 1f6f746..2268b1e 100644 --- a/object_tools/tests/urls.py +++ b/object_tools/tests/urls.py @@ -2,23 +2,16 @@ import object_tools from django.contrib import admin -if django.VERSION >= (2, 0): - from django.urls import path - - urlpatterns = [ - path('admin/', admin.site.urls), - path('object-tools/', object_tools.tools.urls), - ] -else: - try: - from django.conf.urls.defaults import include, url - except ImportError: - from django.conf.urls import include, url +from django.urls import path +urlpatterns = [ + path('admin/', admin.site.urls), + path('object-tools/', object_tools.tools.urls), +] admin.autodiscover() object_tools.autodiscover() urlpatterns = [ - url(r'^admin/', include(admin.site.urls)), - url(r'^object-tools/', include(object_tools.tools.urls)), + path('admin/', include(admin.site.urls)), + path('object-tools/', include(object_tools.tools.urls)), ]