diff --git a/easy/admin/decorators.py b/easy/admin/decorators.py index 27a767c..0c6ac43 100644 --- a/easy/admin/decorators.py +++ b/easy/admin/decorators.py @@ -1,4 +1,3 @@ -from collections.abc import Iterable from functools import wraps from django import utils as django_utils from django.core.cache import cache as django_cache diff --git a/easy/admin/field.py b/easy/admin/field.py index 882ffdf..eb70e6d 100644 --- a/easy/admin/field.py +++ b/easy/admin/field.py @@ -1,11 +1,13 @@ from django.contrib.admin.templatetags.admin_urls import admin_urlname from django.db.models import Model, ImageField as ModelImageField, ForeignKey from django.conf import settings +from django.forms.utils import flatatt +from django.urls import reverse from django.utils.html import conditional_escape from django.template.loader import render_to_string +from django.utils.http import urlencode from django.utils.safestring import mark_safe from .decorators import django_cache -from easy.six import reverse, urlencode, flatatt from easy import helper diff --git a/easy/admin/mixin.py b/easy/admin/mixin.py index 1c57df8..8f9208d 100644 --- a/easy/admin/mixin.py +++ b/easy/admin/mixin.py @@ -1,7 +1,6 @@ from django.contrib import messages from django.http.response import HttpResponseRedirect - -from easy.six import reverse, url +from django.urls import re_path, reverse class MixinEasyViews(object): @@ -13,10 +12,10 @@ def get_urls(self): urls = super(MixinEasyViews, self).get_urls() easy_urls = [ - url(r'^(?P.+)/easy/(?P.+)/$', self.admin_site.admin_view(self.easy_object_view), + re_path(r'^(?P.+)/easy/(?P.+)/$', self.admin_site.admin_view(self.easy_object_view), name='%s_%s_easy' % self._get_info()), - url(r'^easy/(?P.+)/$', self.admin_site.admin_view(self.easy_list_view), + re_path(r'^easy/(?P.+)/$', self.admin_site.admin_view(self.easy_list_view), name='%s_%s_easy' % self._get_info()), ] diff --git a/easy/six.py b/easy/six.py deleted file mode 100644 index 18dcbad..0000000 --- a/easy/six.py +++ /dev/null @@ -1,24 +0,0 @@ -urlencode = None -reverse = None -flatatt = None -url = None - -try: - from django.utils.http import urlencode -except ImportError: - from django.utils.six.moves.urllib.parse import urlencode - -try: - from django.urls import reverse -except: - from django.core.urlresolvers import reverse - -try: - from django.forms.utils import flatatt -except: - from django.forms.util import flatatt - -try: - from django.conf.urls import url -except ImportError as ex: - from django.urls import re_path as url diff --git a/easy/tests.py b/easy/tests.py index f2cdc74..6568ad1 100644 --- a/easy/tests.py +++ b/easy/tests.py @@ -7,8 +7,8 @@ from django.contrib.sessions.backends.db import SessionStore from django.http.request import HttpRequest, QueryDict from django import test +from django.utils.http import urlencode from django.utils.safestring import SafeData -from easy.six import urlencode from model_bakery import baker import easy diff --git a/test_project/urls.py b/test_project/urls.py index f5f42c7..16979f1 100644 --- a/test_project/urls.py +++ b/test_project/urls.py @@ -1,8 +1,9 @@ from django.contrib import admin -from easy.six import url +from django.urls import re_path + # from debug_toolbar.toolbar import debug_toolbar_urls urlpatterns = [ - url(r'^admin/', admin.site.urls), + re_path(r'^admin/', admin.site.urls), ] # + debug_toolbar_urls()