diff --git a/object_tools/__init__.py b/object_tools/__init__.py index 328b7a6..e110b3a 100644 --- a/object_tools/__init__.py +++ b/object_tools/__init__.py @@ -29,10 +29,6 @@ def old_autodiscover(): def autodiscover(): - if django.VERSION < (1, 7): - old_autodiscover() - else: - from django.utils.module_loading import autodiscover_modules - autodiscover_modules('tools', register_to=tools) + from django.utils.module_loading import autodiscover_modules + autodiscover_modules('tools', register_to=tools) -default_app_config = 'object_tools.apps.ObjectToolsAppConfig' diff --git a/object_tools/options.py b/object_tools/options.py index 511b780..ae19ac4 100644 --- a/object_tools/options.py +++ b/object_tools/options.py @@ -2,7 +2,7 @@ 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 @@ -10,7 +10,7 @@ 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 +102,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..cc69952 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,13 +83,13 @@ 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 @property def urls(self): - return self.get_urls(), self.app_name, self.name + return self.get_urls(), self.app_name # ), self.name # This global object represents the default object tools, for the common case. # You can instantiate ObjectTools in your own code to create a diff --git a/object_tools/templates/object_tools/inclusion_tags/object_tools.html b/object_tools/templates/object_tools/inclusion_tags/object_tools.html index 530573e..66ddad0 100644 --- a/object_tools/templates/object_tools/inclusion_tags/object_tools.html +++ b/object_tools/templates/object_tools/inclusion_tags/object_tools.html @@ -1,3 +1,3 @@ {% for object_tool in object_tools %} -
  • {{ object_tool.label }}
  • +
  • {{ object_tool.label }}
  • {% endfor %} diff --git a/object_tools/tests/test_object_tool_creation.py b/object_tools/tests/test_object_tool_creation.py index df25cda..f66d302 100644 --- a/object_tools/tests/test_object_tool_creation.py +++ b/object_tools/tests/test_object_tool_creation.py @@ -66,40 +66,24 @@ def test_media(self): form = tool.construct_form(MockRequest()) media = tool.media(form) - if django.VERSION >= (2, 0): - media_js_list = [ - '', - '', - '', - '', - '', - '', - '', - '' - ] - else: - media_js_list = [ - '', - '', - '', - '', - '', - '' - ] + ] # Media result should also include field specific media. self.assertEqual(media.render_js(), media_js_list) @@ -120,16 +104,10 @@ def test_urls(self): urls = tool.urls self.assertEqual(len(urls), 1, 'urls property should only \ return 1 url') - if django.VERSION >= (2, 0): - self.assertEqual( - urls[0].__repr__(), - "" - ) - else: - self.assertEqual( - urls[0].__repr__(), - '' - ) + self.assertEqual( + urls[0].__repr__(), + "" + ) self.assertEqual( urls[0].name, 'auth_user_test_tool', 'URL should be named as "__".' diff --git a/object_tools/tests/test_object_tools_config.py b/object_tools/tests/test_object_tools_config.py index e6b562b..62075c8 100644 --- a/object_tools/tests/test_object_tools_config.py +++ b/object_tools/tests/test_object_tools_config.py @@ -107,24 +107,14 @@ def test_urls(self): urls = tools.urls self.assertEqual(len(urls[0]), 6) - if django.VERSION >= (2, 0): - urlpatterns = [ - "", - "", - "", - "", - "", - "", - ] - else: - urlpatterns = [ - '', - '', - '', - '', - '', - '' - ] + urlpatterns = [ + "", + "", + "", + "", + "", + "", + ] for url in urls[0]: self.assertTrue(url.url_patterns[0].__repr__() in 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)), ]