fixed reverse reverse_lazy import errors

djadmin2/apiviews.py

@@ -4,7 +4,7 @@ from __future__ import division, absolute_import, unicode_literals
 from django.utils.encoding import force_str
 from rest_framework import fields, generics, serializers
 from rest_framework.response import Response
-from rest_framework.reverse import reverse
+from rest_framework.reverse import reverse as drf_reverse
 from rest_framework.views import APIView
 
 from . import utils
@@ -76,7 +76,7 @@ class IndexAPIView(Admin2APIMixin, APIView):
             'app_label': model_options.app_label,
             'model_name': model_options.object_name.lower(),
         }
-        model_url = reverse(
+        model_url = drf_reverse(
             '%(current_app)s:%(app_label)s_%(model_name)s_api_list' % opts,
             request=self.request,
             format=self.kwargs.get('format'))

djadmin2/forms.py

@@ -6,7 +6,7 @@ from django.contrib.auth import authenticate
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth.forms import UserCreationForm, UserChangeForm
 from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 
 from django.utils.translation import ugettext_lazy as _
 

djadmin2/tests/test_auth_admin.py

@@ -1,8 +1,9 @@
 from django import forms
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.client import RequestFactory
+from django.urls import reverse
+
 
 from djadmin2.site import djadmin2_site
 from ..admin2 import UserAdmin2

djadmin2/tests/test_views.py

@@ -1,7 +1,9 @@
-from django.core.urlresolvers import reverse
 from django.test import TestCase, override_settings
+from django.urls import reverse
+
 from django.utils.encoding import force_text
 
+
 from .. import views
 
 

djadmin2/types.py

@@ -8,8 +8,8 @@ from collections import namedtuple
 
 import extra_views
 from django.conf.urls import url
-from django.core.urlresolvers import reverse
 from django.forms import modelform_factory
+from django.urls import reverse
 from django.utils.six import with_metaclass
 
 from . import actions

djadmin2/viewmixins.py

@@ -5,9 +5,9 @@ import os
 
 from django.contrib.auth.views import redirect_to_login
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse, reverse_lazy
 from django.forms.models import modelform_factory
 from django.http import HttpResponseRedirect
+from django.urls import reverse, reverse_lazy
 from django.utils.encoding import force_text
 from django.utils.text import get_text_list
 from django.utils.translation import ugettext as _

djadmin2/views.py

@@ -13,7 +13,6 @@ from django.contrib.auth.forms import (PasswordChangeForm,
 from django.contrib.auth.views import (logout as auth_logout,
                                        login as auth_login)
 from django.contrib.contenttypes.models import ContentType
-from django.core.urlresolvers import reverse, reverse_lazy
 from django.db import models, router
 from django.db.models.fields import FieldDoesNotExist
 from django.http import HttpResponseRedirect
@@ -21,6 +20,8 @@ from django.shortcuts import get_object_or_404
 from django.utils.encoding import force_text
 from django.utils.text import capfirst
 from django.utils.translation import ugettext_lazy
+from django.urls import reverse, reverse_lazy
+
 from django.views import generic
 
 from . import permissions, utils

example/blog/tests/test_apiviews.py

@@ -4,9 +4,9 @@ import json
 
 from django.contrib.auth.models import AnonymousUser, User
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.client import RequestFactory
+from django.urls import reverse
 from django.utils.encoding import force_text
 
 from djadmin2 import apiviews

example/blog/tests/test_builtin_api_resources.py

@@ -1,5 +1,5 @@
 from django.contrib.auth.models import Group, User
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from .test_apiviews import APITestCase
 

example/blog/tests/test_filters.py

@@ -2,9 +2,9 @@
 # vim:fenc=utf-8
 
 import django_filters
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.client import RequestFactory
+from django.urls import reverse
 
 from djadmin2 import filters as djadmin2_filters
 from djadmin2.types import ModelAdmin2
@@ -20,7 +20,6 @@ class ListFilterBuilderTest(TestCase):
         class PostAdminSimple(ModelAdmin2):
             list_filter = ['published', ]
 
-
         class PostAdminWithFilterInstances(ModelAdmin2):
             list_filter = [
                 django_filters.BooleanFilter(name='published'),
@@ -31,7 +30,6 @@ class ListFilterBuilderTest(TestCase):
                 model = Post
                 fields = ['published']
 
-
         class PostAdminWithFilterSetInst(ModelAdmin2):
             list_filter = FS
 

example/blog/tests/test_permissions.py

@@ -1,10 +1,10 @@
 from blog.models import Post
 from django.contrib.auth.models import User, Permission
-from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404
 from django.template import Template, Context
 from django.test import TestCase
 from django.test.client import RequestFactory
+from django.urls import reverse
 
 from djadmin2.permissions import TemplatePermissionChecker
 from djadmin2.site import djadmin2_site

example/blog/tests/test_views.py

@@ -5,8 +5,8 @@ from datetime import datetime
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
-from django.core.urlresolvers import reverse
 from django.test import TestCase, Client
+from django.urls import reverse
 from django.utils.encoding import force_text
 
 from ..models import Post, Comment