Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions object_tools/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions object_tools/sites.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []

Expand All @@ -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

Expand Down
21 changes: 7 additions & 14 deletions object_tools/tests/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
]