Replace `django.core.urlresolvers` with `django.urls`

docs/advanced_topics/images/image_serve_view.rst

@@ -59,7 +59,7 @@ block the initial response while rendering like the ``{% image %}`` tag does.
 
 .. code-block:: python
 
-    from django.core.urlresolvers import reverse
+    from django.urls import reverse
     from wagtail.wagtailimages.views.serve import generate_signature
 
     def generate_image_url(image, filter_spec):

docs/reference/hooks.rst

@@ -137,7 +137,7 @@ Hooks for building new areas of the admin interface (alongside pages, images, do
 
   .. code-block:: python
 
-    from django.core.urlresolvers import reverse
+    from django.urls import reverse
 
     from wagtail.wagtailcore import hooks
     from wagtail.wagtailadmin.menu import MenuItem
@@ -214,7 +214,7 @@ Hooks for building new areas of the admin interface (alongside pages, images, do
 
   .. code-block:: python
 
-    from django.core.urlresolvers import reverse
+    from django.urls import reverse
     from wagtail.wagtailcore import hooks
     from wagtail.wagtailadmin.search import SearchArea
 
@@ -626,7 +626,7 @@ Page explorer
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
   Add buttons to the "More" dropdown menu for a page in the page explorer. This works similarly to the ``register_page_listing_buttons`` hook but is useful for lesser-used custom actions that are better suited for the dropdown.
-  
+
   This example will add a simple button to the dropdown menu:
 
   .. code-block:: python

wagtail/api/v2/endpoints.py

@@ -4,8 +4,8 @@ from collections import OrderedDict
 
 from django.conf.urls import url
 from django.core.exceptions import FieldDoesNotExist
-from django.core.urlresolvers import reverse
 from django.http import Http404
+from django.urls import reverse
 from modelcluster.fields import ParentalKey
 from rest_framework import status
 from rest_framework.renderers import BrowsableAPIRenderer, JSONRenderer

wagtail/api/v2/serializers.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from collections import OrderedDict
 
-from django.core.urlresolvers import NoReverseMatch
+from django.urls.exceptions import NoReverseMatch
 from modelcluster.models import get_all_child_relations
 from rest_framework import relations, serializers
 from rest_framework.fields import Field, SkipField

wagtail/api/v2/signal_handlers.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.core.urlresolvers import reverse
 from django.db.models.signals import post_delete, post_save
+from django.urls import reverse
 
 from wagtail.contrib.wagtailfrontendcache.utils import purge_url_from_cache
 from wagtail.wagtailcore.models import get_page_models

wagtail/api/v2/tests/test_documents.py

@@ -3,9 +3,9 @@ from __future__ import absolute_import, unicode_literals
 import json
 
 import mock
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.urls import reverse
 
 from wagtail.api.v2 import signal_handlers
 from wagtail.wagtaildocs.models import get_document_model

wagtail/api/v2/tests/test_images.py

@@ -3,9 +3,9 @@ from __future__ import absolute_import, unicode_literals
 import json
 
 import mock
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.urls import reverse
 
 from wagtail.api.v2 import signal_handlers
 from wagtail.wagtailimages import get_image_model

wagtail/api/v2/tests/test_pages.py

@@ -4,9 +4,9 @@ import collections
 import json
 
 import mock
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.urls import reverse
 
 from wagtail.api.v2 import signal_handlers
 from wagtail.tests.demosite import models

wagtail/contrib/modeladmin/helpers/url.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.functional import cached_property
 from django.utils.http import urlquote
 

wagtail/contrib/modeladmin/options.py

@@ -13,7 +13,7 @@ from .helpers import (
     AdminURLHelper, ButtonHelper, PageAdminURLHelper, PageButtonHelper, PagePermissionHelper,
     PermissionHelper)
 from .menus import GroupMenuItem, ModelAdminMenuItem, SubMenu
-from .mixins import ThumbnailMixin # NOQA
+from .mixins import ThumbnailMixin  # NOQA
 from .views import ChooseParentView, CreateView, DeleteView, EditView, IndexView, InspectView
 
 

wagtail/contrib/settings/forms.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django import forms
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from wagtail.wagtailcore.models import Site
 

wagtail/contrib/settings/registry.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.apps import apps
 from django.contrib.auth.models import Permission
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.text import capfirst
 
 from wagtail.wagtailadmin.menu import MenuItem

wagtail/contrib/settings/tests/test_admin.py

@@ -2,8 +2,8 @@ from __future__ import absolute_import, unicode_literals
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission
-from django.core.urlresolvers import reverse
 from django.test import TestCase, override_settings
+from django.urls import reverse
 from django.utils.text import capfirst
 
 from wagtail.contrib.settings.registry import SettingMenuItem

wagtail/contrib/settings/tests/test_register.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 
 from wagtail.contrib.settings.registry import Registry
 from wagtail.tests.testapp.models import NotYetRegisteredSetting

wagtail/contrib/wagtailroutablepage/models.py

@@ -1,9 +1,9 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.conf.urls import url
-from django.core.urlresolvers import RegexURLResolver
 from django.http import Http404
 from django.template.response import TemplateResponse
+from django.urls.resolvers import RegexURLResolver
 
 from wagtail.wagtailcore.models import Page
 from wagtail.wagtailcore.url_routing import RouteResult

wagtail/contrib/wagtailroutablepage/tests.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import, unicode_literals
 
 import mock
-from django.core.urlresolvers import NoReverseMatch
 from django.test import RequestFactory, TestCase
+from django.urls.exceptions import NoReverseMatch
 
 from wagtail.contrib.wagtailroutablepage.templatetags.wagtailroutablepage_tags import \
     routablepageurl

wagtail/contrib/wagtailsearchpromotions/tests.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 
 from wagtail.contrib.wagtailsearchpromotions.models import SearchPromotion
 from wagtail.contrib.wagtailsearchpromotions.templatetags.wagtailsearchpromotions_tags import \

wagtail/contrib/wagtailsearchpromotions/views.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404, redirect, render
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 from django.views.decorators.vary import vary_on_headers
 

wagtail/contrib/wagtailsearchpromotions/wagtail_hooks.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.conf.urls import include, url
 from django.contrib.auth.models import Permission
-from django.core import urlresolvers
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from wagtail.contrib.wagtailsearchpromotions import admin_urls
@@ -30,7 +30,7 @@ class SearchPicksMenuItem(MenuItem):
 def register_search_picks_menu_item():
     return SearchPicksMenuItem(
         _('Promoted search results'),
-        urlresolvers.reverse('wagtailsearchpromotions:index'),
+        reverse('wagtailsearchpromotions:index'),
         classnames='icon icon-pick', order=900
     )
 

wagtail/contrib/wagtailstyleguide/tests.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 
 from wagtail.tests.utils import WagtailTestUtils
 

wagtail/contrib/wagtailstyleguide/views.py

@@ -4,6 +4,7 @@ from django import forms
 from django.core.paginator import Paginator
 from django.shortcuts import render
 from django.utils.translation import ugettext as _
+
 from wagtail.wagtailadmin import messages
 from wagtail.wagtailadmin.forms import SearchForm
 from wagtail.wagtailadmin.rich_text import get_rich_text_editor_widget

wagtail/contrib/wagtailstyleguide/wagtail_hooks.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.conf.urls import url
-from django.core import urlresolvers
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from wagtail.wagtailadmin.menu import MenuItem
@@ -21,7 +21,7 @@ def register_admin_urls():
 def register_styleguide_menu_item():
     return MenuItem(
         _('Styleguide'),
-        urlresolvers.reverse('wagtailstyleguide'),
+        reverse('wagtailstyleguide'),
         classnames='icon icon-image',
         order=1000
     )

wagtail/tests/urls.py

@@ -16,7 +16,6 @@ from wagtail.wagtailimages.api.v2.endpoints import ImagesAPIEndpoint
 from wagtail.wagtailimages.tests import urls as wagtailimages_test_urls
 from wagtail.wagtailsearch import urls as wagtailsearch_urls
 
-
 api_router = WagtailAPIRouter('wagtailapi_v2')
 api_router.register_endpoint('pages', PagesAPIEndpoint)
 api_router.register_endpoint('images', ImagesAPIEndpoint)

wagtail/tests/utils.py

@@ -5,9 +5,9 @@ import warnings
 from contextlib import contextmanager
 
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.testcases import assert_and_parse_html
+from django.urls import reverse
 from django.utils import six
 from django.utils.text import slugify
 

wagtail/utils/pagination.py

@@ -4,7 +4,6 @@ from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.utils.http import urlencode
 from django.utils.six.moves.urllib.parse import parse_qs
 
-
 DEFAULT_PAGE_KEY = 'p'
 
 

wagtail/utils/urlpatterns.py

@@ -1,4 +1,5 @@
 from __future__ import absolute_import, unicode_literals
+
 from functools import update_wrapper
 
 

wagtail/wagtailadmin/decorators.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.contrib.auth.views import redirect_to_login as auth_redirect_to_login
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import activate as activate_lang
 from django.utils.translation import ugettext as _
 

wagtail/wagtailadmin/forms.py

@@ -20,10 +20,8 @@ from taggit.managers import TaggableManager
 
 from wagtail.wagtailadmin import widgets
 from wagtail.wagtailcore.models import (
-    BaseViewRestriction,
-    Collection, CollectionViewRestriction, GroupCollectionPermission,
-    Page, PageViewRestriction
-)
+    BaseViewRestriction, Collection, CollectionViewRestriction, GroupCollectionPermission, Page,
+    PageViewRestriction)
 
 
 class URLOrAbsolutePathValidator(validators.URLValidator):

wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py

@@ -17,10 +17,7 @@ from wagtail.wagtailadmin.navigation import get_explorable_root_page
 from wagtail.wagtailadmin.search import admin_search_areas
 from wagtail.wagtailcore import hooks
 from wagtail.wagtailcore.models import (
-    CollectionViewRestriction,
-    Page, PageViewRestriction,
-    UserPagePermissionsProxy
-)
+    CollectionViewRestriction, Page, PageViewRestriction, UserPagePermissionsProxy)
 from wagtail.wagtailcore.utils import cautious_slugify as _cautious_slugify
 from wagtail.wagtailcore.utils import camelcase_to_underscore, escape_script
 

wagtail/wagtailadmin/tests/api/test_documents.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 import json
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from wagtail.api.v2.tests.test_documents import TestDocumentDetail, TestDocumentListing
 from wagtail.wagtaildocs.models import Document

wagtail/wagtailadmin/tests/api/test_images.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 import json
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from wagtail.api.v2.tests.test_images import TestImageDetail, TestImageListing
 from wagtail.wagtailimages import get_image_model

wagtail/wagtailadmin/tests/api/test_pages.py

@@ -4,7 +4,7 @@ import collections
 import datetime
 import json
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils import timezone
 
 from wagtail.api.v2.tests.test_pages import TestPageDetail, TestPageListing

wagtail/wagtailadmin/tests/test_account_management.py

@@ -4,8 +4,8 @@ from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
 from django.contrib.auth.tokens import PasswordResetTokenGenerator
 from django.core import mail
-from django.core.urlresolvers import reverse
 from django.test import TestCase, override_settings
+from django.urls import reverse
 
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.wagtailadmin.utils import (

wagtail/wagtailadmin/tests/test_admin_search.py

@@ -4,9 +4,9 @@ Tests for the search box in the admin side menu, and the custom search hooks.
 from __future__ import absolute_import, unicode_literals
 
 from django.contrib.auth.models import Permission
-from django.core.urlresolvers import reverse
 from django.template import Context, Template
 from django.test import RequestFactory, TestCase
+from django.urls import reverse
 
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.wagtailadmin.utils import user_has_any_page_permission

wagtail/wagtailadmin/tests/test_buttons_hooks.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.wagtailadmin import widgets as wagtailadmin_widgets

wagtail/wagtailadmin/tests/test_collections_views.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.wagtailcore.models import Collection

wagtail/wagtailadmin/tests/test_messages.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.contrib import messages
-from django.core.urlresolvers import reverse
 from django.test import TestCase, override_settings
+from django.urls import reverse
 
 
 class TestPageExplorer(TestCase):

wagtail/wagtailadmin/tests/test_page_chooser.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 from django.utils.http import urlencode
 
 from wagtail.tests.testapp.models import EventIndex, EventPage, SimplePage, SingleEventPage

wagtail/wagtailadmin/tests/test_pages_views.py

@@ -12,18 +12,19 @@ from django.contrib.contenttypes.models import ContentType
 from django.contrib.messages import constants as message_constants
 from django.core import mail, paginator
 from django.core.files.base import ContentFile
-from django.core.urlresolvers import reverse
 from django.db.models.signals import post_delete, pre_delete
 from django.http import HttpRequest, HttpResponse
 from django.test import TestCase, modify_settings
+from django.urls import reverse
 from django.utils import formats, timezone
 from django.utils.dateparse import parse_date
-
 from freezegun import freeze_time
+
 from wagtail.tests.testapp.models import (
     EVENT_AUDIENCE_CHOICES, Advert, AdvertPlacement, BusinessChild, BusinessIndex, BusinessSubIndex,
-    DefaultStreamPage, EventCategory, EventPage, EventPageCarouselItem, FilePage, ManyToManyBlogPage,
-    SimplePage, SingleEventPage, SingletonPage, StandardChild, StandardIndex, TaggedPage)
+    DefaultStreamPage, EventCategory, EventPage, EventPageCarouselItem, FilePage,
+    ManyToManyBlogPage, SimplePage, SingleEventPage, SingletonPage, StandardChild, StandardIndex,
+    TaggedPage)
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.wagtailadmin.views.home import RecentEditsPanel
 from wagtail.wagtailadmin.views.pages import PreviewOnEdit

wagtail/wagtailadmin/tests/test_password_reset.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.core import mail
-from django.core.urlresolvers import reverse
 from django.test import TestCase, override_settings
+from django.urls import reverse
 
 from wagtail.tests.utils import WagtailTestUtils
 
@@ -13,11 +13,11 @@ class TestUserPasswordReset(TestCase, WagtailTestUtils):
     # need to clear urlresolver caches before/after tests, because we override ROOT_URLCONF
     # in some tests here
     def setUp(self):
-        from django.core.urlresolvers import clear_url_caches
+        from django.urls import clear_url_caches
         clear_url_caches()
 
     def tearDown(self):
-        from django.core.urlresolvers import clear_url_caches
+        from django.urls import clear_url_caches
         clear_url_caches()
 
     def test_login_has_password_reset_option(self):

wagtail/wagtailadmin/tests/test_privacy.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.contrib.auth.models import Group
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 
 from wagtail.tests.testapp.models import SimplePage
 from wagtail.tests.utils import WagtailTestUtils

wagtail/wagtailadmin/tests/test_rich_text.py

@@ -1,9 +1,9 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.urls import reverse
 
 from wagtail.tests.testapp.models import SingleEventPage
 from wagtail.tests.testapp.rich_text import CustomRichTextArea

wagtail/wagtailadmin/tests/test_userbar.py

@@ -2,10 +2,10 @@ from __future__ import absolute_import, unicode_literals
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AnonymousUser
-from django.core.urlresolvers import reverse
 from django.template import Context, Template
 from django.test import TestCase
 from django.test.client import RequestFactory
+from django.urls import reverse
 
 from wagtail.tests.testapp.models import BusinessChild, BusinessIndex
 from wagtail.tests.utils import WagtailTestUtils

wagtail/wagtailadmin/tests/tests.py

@@ -7,8 +7,8 @@ import json
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
 from django.core import mail
-from django.core.urlresolvers import reverse, reverse_lazy
 from django.test import TestCase, override_settings
+from django.urls import reverse, reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from taggit.models import Tag
 

wagtail/wagtailadmin/views/generic.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.core.urlresolvers import reverse
 from django.shortcuts import redirect
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 from django.utils.translation import ugettext_lazy
 from django.views.generic.base import TemplateResponseMixin

wagtail/wagtailadmin/views/pages.py

@@ -1,14 +1,15 @@
 from __future__ import absolute_import, unicode_literals
+
 from time import time
 
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
 from django.db.models import Count
 from django.http import Http404, HttpResponse, JsonResponse
 from django.http.request import QueryDict
 from django.shortcuts import get_object_or_404, redirect, render
 from django.template.loader import render_to_string
+from django.urls import reverse
 from django.utils import timezone
 from django.utils.http import is_safe_url, urlquote
 from django.utils.safestring import mark_safe

wagtail/wagtailadmin/wagtail_hooks.py

@@ -1,14 +1,13 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.contrib.auth.models import Permission
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from wagtail.wagtailadmin.menu import MenuItem, SubmenuMenuItem, settings_menu
 from wagtail.wagtailadmin.navigation import get_explorable_root_page
 from wagtail.wagtailadmin.rich_text import (
-    HalloFormatPlugin, HalloHeadingPlugin, HalloListPlugin, HalloPlugin
-)
+    HalloFormatPlugin, HalloHeadingPlugin, HalloListPlugin, HalloPlugin)
 from wagtail.wagtailadmin.search import SearchArea
 from wagtail.wagtailadmin.utils import user_has_any_page_permission
 from wagtail.wagtailadmin.viewsets import viewsets

wagtail/wagtailadmin/widgets.py

@@ -5,10 +5,10 @@ import json
 from functools import total_ordering
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
 from django.forms import widgets
 from django.forms.utils import flatatt
 from django.template.loader import render_to_string
+from django.urls import reverse
 from django.utils.formats import get_format
 from django.utils.functional import cached_property
 from django.utils.html import format_html
@@ -20,7 +20,6 @@ from wagtail.wagtailadmin.datetimepicker import to_datetimepicker_format
 from wagtail.wagtailcore import hooks
 from wagtail.wagtailcore.models import Page
 
-
 DEFAULT_DATE_FORMAT = '%Y-%m-%d'
 DEFAULT_DATETIME_FORMAT = '%Y-%m-%d %H:%M'
 

wagtail/wagtailcore/blocks/utils.py

@@ -2,6 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 import re
 
+
 # helpers for Javascript expression formatting
 
 

wagtail/wagtailcore/middleware.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.utils.deprecation import MiddlewareMixin
+
 from wagtail.wagtailcore.models import Site
 
 

wagtail/wagtailcore/models.py

@@ -12,12 +12,12 @@ from django.core.cache import cache
 from django.core.exceptions import ValidationError
 from django.core.handlers.base import BaseHandler
 from django.core.handlers.wsgi import WSGIRequest
-from django.core.urlresolvers import reverse
 from django.db import connection, models, transaction
 from django.db.models import Q, Value
 from django.db.models.functions import Concat, Substr
 from django.http import Http404
 from django.template.response import TemplateResponse
+from django.urls import reverse
 # Must be imported from Django so we get the new implementation of with_metaclass
 from django.utils import six, timezone
 from django.utils.functional import cached_property

wagtail/wagtailcore/sites.py

@@ -3,7 +3,6 @@ from __future__ import absolute_import, unicode_literals
 from django.apps import apps
 from django.db.models import Case, IntegerField, Q, When
 
-
 MATCH_HOSTNAME_PORT = 0
 MATCH_HOSTNAME_DEFAULT = 1
 MATCH_DEFAULT = 2

wagtail/wagtailcore/tests/test_page_model.py

@@ -12,16 +12,14 @@ from django.http import Http404, HttpRequest
 from django.test import Client, TestCase
 from django.test.client import RequestFactory
 from django.test.utils import override_settings
-
 from freezegun import freeze_time
 
 from wagtail.tests.testapp.models import (
     AbstractPage, Advert, AlwaysShowInMenusPage, BlogCategory, BlogCategoryBlogPage, BusinessChild,
-    BusinessIndex, BusinessNowherePage, BusinessSubIndex,
-    CustomManager, CustomManagerPage, CustomPageQuerySet,
-    EventIndex, EventPage, GenericSnippetPage, ManyToManyBlogPage, MTIBasePage, MTIChildPage,
-    MyCustomPage, OneToOnePage, SimplePage, SingleEventPage, SingletonPage, StandardIndex,
-    TaggedPage)
+    BusinessIndex, BusinessNowherePage, BusinessSubIndex, CustomManager, CustomManagerPage,
+    CustomPageQuerySet, EventIndex, EventPage, GenericSnippetPage, ManyToManyBlogPage, MTIBasePage,
+    MTIChildPage, MyCustomPage, OneToOnePage, SimplePage, SingleEventPage, SingletonPage,
+    StandardIndex, TaggedPage)
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.wagtailcore.models import Page, PageManager, Site, get_page_models
 
@@ -224,11 +222,11 @@ class TestRouting(TestCase):
     # need to clear urlresolver caches before/after tests, because we override ROOT_URLCONF
     # in some tests here
     def setUp(self):
-        from django.core.urlresolvers import clear_url_caches
+        from django.urls import clear_url_caches
         clear_url_caches()
 
     def tearDown(self):
-        from django.core.urlresolvers import clear_url_caches
+        from django.urls import clear_url_caches
         clear_url_caches()
 
     def test_urls(self):
@@ -399,11 +397,11 @@ class TestServeView(TestCase):
 
         # also need to clear urlresolver caches before/after tests, because we override
         # ROOT_URLCONF in some tests here
-        from django.core.urlresolvers import clear_url_caches
+        from django.urls import clear_url_caches
         clear_url_caches()
 
     def tearDown(self):
-        from django.core.urlresolvers import clear_url_caches
+        from django.urls import clear_url_caches
         clear_url_caches()
 
     def test_serve(self):

wagtail/wagtailcore/tests/test_views.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.wagtailcore.models import Page

wagtail/wagtailcore/url_routing.py

@@ -5,7 +5,7 @@ class RouteResult(object):
     """
     An object to be returned from Page.route, which encapsulates
     all the information necessary to serve an HTTP response. Analogous to
-    django.core.urlresolvers.ResolverMatch, except that it identifies
+    django.urls.resolvers.ResolverMatch, except that it identifies
     a Page instance that we will call serve(*args, **kwargs) on, rather
     than a view function.
     """

wagtail/wagtailcore/urls.py

@@ -7,7 +7,6 @@ from django.contrib.auth import views as auth_views
 from wagtail.wagtailcore import views
 from wagtail.wagtailcore.utils import WAGTAIL_APPEND_SLASH
 
-
 if WAGTAIL_APPEND_SLASH:
     # If WAGTAIL_APPEND_SLASH is True (the default value), we match a
     # (possibly empty) list of path segments ending in slashes.

wagtail/wagtailcore/utils.py

@@ -11,7 +11,6 @@ from django.utils.encoding import force_text
 from django.utils.six import string_types
 from django.utils.text import slugify
 
-
 WAGTAIL_APPEND_SLASH = getattr(settings, 'WAGTAIL_APPEND_SLASH', True)
 
 

wagtail/wagtailcore/views.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.core.urlresolvers import reverse
 from django.http import Http404, HttpResponse
 from django.shortcuts import get_object_or_404, redirect
+from django.urls import reverse
 
 from wagtail.wagtailcore import hooks
 from wagtail.wagtailcore.forms import PasswordViewRestrictionForm

wagtail/wagtailcore/wagtail_hooks.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.conf import settings
 from django.contrib.auth.views import redirect_to_login
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from wagtail.wagtailcore import hooks
 from wagtail.wagtailcore.models import PageViewRestriction

wagtail/wagtaildocs/models.py

@@ -4,9 +4,9 @@ import os.path
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import reverse
 from django.db import models
 from django.dispatch import Signal
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 from taggit.managers import TaggableManager
 

wagtail/wagtaildocs/tests/test_admin_views.py

@@ -6,9 +6,9 @@ from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
 from django.core.files.base import ContentFile
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.urls import reverse
 from django.utils.six import b
 
 from wagtail.tests.testapp.models import EventPage, EventPageRelatedLink

wagtail/wagtaildocs/tests/test_collection_privacy.py

@@ -2,8 +2,8 @@ from __future__ import absolute_import, unicode_literals
 
 from django.contrib.auth.models import Group
 from django.core.files.base import ContentFile
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 from django.utils.six import b
 
 from wagtail.wagtailcore.models import Collection, CollectionViewRestriction

wagtail/wagtaildocs/tests/test_rich_text.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 from bs4 import BeautifulSoup
-
 from django.test import TestCase
 
 from wagtail.wagtaildocs.rich_text import DocumentLinkHandler

wagtail/wagtaildocs/tests/test_search.py

@@ -3,9 +3,9 @@ from __future__ import absolute_import, unicode_literals
 import unittest
 
 from django.core.files.base import ContentFile
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.urls import reverse
 from django.utils.six import b
 
 from wagtail.tests.utils import WagtailTestUtils

wagtail/wagtaildocs/tests/test_views.py

@@ -4,13 +4,12 @@ import os.path
 import unittest
 
 import mock
-
 from django.conf import settings
 from django.core.files.base import ContentFile
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.urls import reverse
 
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.wagtaildocs import models

wagtail/wagtaildocs/views/chooser.py

@@ -2,8 +2,8 @@ from __future__ import absolute_import, unicode_literals
 
 import json
 
-from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404, render
+from django.urls import reverse
 
 from wagtail.utils.pagination import paginate
 from wagtail.wagtailadmin.forms import SearchForm

wagtail/wagtaildocs/views/documents.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404, redirect, render
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 from django.views.decorators.vary import vary_on_headers
 

wagtail/wagtaildocs/views/serve.py

@@ -3,10 +3,10 @@ from __future__ import absolute_import, unicode_literals
 from wsgiref.util import FileWrapper
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
 from django.http import Http404, HttpResponse, StreamingHttpResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
+from django.urls import reverse
 
 from wagtail.utils import sendfile_streaming_backend
 from wagtail.utils.sendfile import sendfile

wagtail/wagtaildocs/wagtail_hooks.py

@@ -3,8 +3,8 @@ from __future__ import absolute_import, unicode_literals
 from django.conf import settings
 from django.conf.urls import include, url
 from django.contrib.staticfiles.templatetags.staticfiles import static
-from django.core import urlresolvers
 from django.template.response import TemplateResponse
+from django.urls import reverse
 from django.utils.html import format_html, format_html_join
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext
@@ -47,7 +47,7 @@ class DocumentsMenuItem(MenuItem):
 def register_documents_menu_item():
     return DocumentsMenuItem(
         _('Documents'),
-        urlresolvers.reverse('wagtaildocs:index'),
+        reverse('wagtaildocs:index'),
         name='documents',
         classnames='icon icon-doc-full-inverse',
         order=400
@@ -69,7 +69,7 @@ def editor_js():
             window.chooserUrls.documentChooser = '{0}';
         </script>
         """,
-        urlresolvers.reverse('wagtaildocs:chooser')
+        reverse('wagtaildocs:chooser')
     )
 
 
@@ -120,7 +120,7 @@ class DocsSearchArea(SearchArea):
 @hooks.register('register_admin_search_area')
 def register_documents_search_area():
     return DocsSearchArea(
-        _('Documents'), urlresolvers.reverse('wagtaildocs:index'),
+        _('Documents'), reverse('wagtaildocs:index'),
         name='documents',
         classnames='icon icon-doc-full-inverse',
         order=400)
@@ -135,7 +135,7 @@ def register_document_permissions_panel():
 def describe_collection_docs(collection):
     docs_count = get_document_model().objects.filter(collection=collection).count()
     if docs_count:
-        url = urlresolvers.reverse('wagtaildocs:index') + ('?collection_id=%d' % collection.id)
+        url = reverse('wagtaildocs:index') + ('?collection_id=%d' % collection.id)
         return {
             'count': docs_count,
             'count_text': ungettext(
@@ -162,7 +162,7 @@ def check_view_restrictions(document, request):
                 from wagtail.wagtailcore.forms import PasswordViewRestrictionForm
                 form = PasswordViewRestrictionForm(instance=restriction,
                                                    initial={'return_url': request.get_full_path()})
-                action_url = urlresolvers.reverse('wagtaildocs_authenticate_with_password', args=[restriction.id])
+                action_url = reverse('wagtaildocs_authenticate_with_password', args=[restriction.id])
 
                 password_required_template = getattr(settings, 'DOCUMENT_PASSWORD_REQUIRED_TEMPLATE', 'wagtaildocs/password_required.html')
 

wagtail/wagtailembeds/oembed_providers.py

@@ -1,6 +1,5 @@
 from __future__ import absolute_import, unicode_literals
 
-
 speakerdeck = {
     "endpoint": "https://speakerdeck.com/oembed.{format}",
     "urls": [

wagtail/wagtailembeds/tests.py

@@ -6,8 +6,8 @@ import django.utils.six.moves.urllib.request
 from bs4 import BeautifulSoup
 from django import template
 from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse
 from django.test import TestCase, override_settings
+from django.urls import reverse
 from django.utils.six.moves.urllib.error import URLError
 from mock import patch
 

wagtail/wagtailembeds/wagtail_hooks.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.conf.urls import include, url
-from django.core import urlresolvers
+from django.urls import reverse
 from django.utils.html import format_html
 
 from wagtail.wagtailadmin.rich_text import HalloPlugin
@@ -25,7 +25,7 @@ def editor_js():
                 window.chooserUrls.embedsChooser = '{0}';
             </script>
         """,
-        urlresolvers.reverse('wagtailembeds:chooser')
+        reverse('wagtailembeds:chooser')
     )
 
 

wagtail/wagtailforms/tests/test_views.py

@@ -4,8 +4,8 @@ from __future__ import absolute_import, unicode_literals
 import json
 
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 
 from wagtail.tests.testapp.models import (
     CustomFormPageSubmission, FormField, FormFieldWithCustomSubmission, FormPage)

wagtail/wagtailforms/tests/utils.py

@@ -2,9 +2,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from wagtail.tests.testapp.models import (
-    FormField, FormFieldWithCustomSubmission,
-    FormPage, FormPageWithCustomSubmission
-)
+    FormField, FormFieldWithCustomSubmission, FormPage, FormPageWithCustomSubmission)
 from wagtail.wagtailcore.models import Page
 
 

wagtail/wagtailforms/wagtail_hooks.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.conf.urls import include, url
-from django.core import urlresolvers
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from wagtail.wagtailadmin.menu import MenuItem
@@ -26,6 +26,6 @@ class FormsMenuItem(MenuItem):
 @hooks.register('register_admin_menu_item')
 def register_forms_menu_item():
     return FormsMenuItem(
-        _('Forms'), urlresolvers.reverse('wagtailforms:index'),
+        _('Forms'), reverse('wagtailforms:index'),
         name='forms', classnames='icon icon-form', order=700
     )

wagtail/wagtailimages/models.py

@@ -8,9 +8,10 @@ from contextlib import contextmanager
 from django.conf import settings
 from django.core import checks
 from django.core.files import File
-from django.core.urlresolvers import reverse
 from django.db import models
 from django.forms.utils import flatatt
+
+from django.urls import reverse
 from django.utils.functional import cached_property
 from django.utils.safestring import mark_safe
 from django.utils.six import BytesIO, string_types, text_type

wagtail/wagtailimages/tests/test_admin_views.py

@@ -5,9 +5,9 @@ import json
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.core.urlresolvers import reverse
 from django.template.defaultfilters import filesizeformat
 from django.test import TestCase, override_settings
+from django.urls import reverse
 from django.utils.http import RFC3986_SUBDELIMS, urlquote
 
 from wagtail.tests.utils import WagtailTestUtils

wagtail/wagtailimages/tests/test_models.py

@@ -5,10 +5,10 @@ import unittest
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.core.urlresolvers import reverse
 from django.db.utils import IntegrityError
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.urls import reverse
 from willow.image import Image as WillowImage
 
 from wagtail.tests.testapp.models import EventPage, EventPageCarouselItem

wagtail/wagtailimages/tests/tests.py

@@ -6,8 +6,8 @@ import unittest
 from django import forms, template
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import reverse
 from django.test import TestCase, override_settings
+from django.urls import reverse
 from django.utils import six
 from mock import MagicMock
 from taggit.forms import TagField, TagWidget

wagtail/wagtailimages/views/chooser.py

@@ -2,8 +2,8 @@ from __future__ import absolute_import, unicode_literals
 
 import json
 
-from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404, render
+from django.urls import reverse
 
 from wagtail.utils.pagination import paginate
 from wagtail.wagtailadmin.forms import SearchForm

wagtail/wagtailimages/views/images.py

@@ -2,9 +2,10 @@ from __future__ import absolute_import, unicode_literals
 
 import os
 
-from django.core.urlresolvers import NoReverseMatch, reverse
 from django.http import HttpResponse, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
+from django.urls import reverse
+from django.urls.exceptions import NoReverseMatch
 from django.utils.translation import ugettext as _
 from django.views.decorators.vary import vary_on_headers
 

wagtail/wagtailimages/wagtail_hooks.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.conf.urls import include, url
 from django.contrib.staticfiles.templatetags.staticfiles import static
-from django.core import urlresolvers
+from django.urls import reverse
 from django.utils.html import format_html, format_html_join
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext
@@ -41,7 +41,7 @@ class ImagesMenuItem(MenuItem):
 @hooks.register('register_admin_menu_item')
 def register_images_menu_item():
     return ImagesMenuItem(
-        _('Images'), urlresolvers.reverse('wagtailimages:index'),
+        _('Images'), reverse('wagtailimages:index'),
         name='images', classnames='icon icon-image', order=300
     )
 
@@ -61,7 +61,7 @@ def editor_js():
             window.chooserUrls.imageChooser = '{0}';
         </script>
         """,
-        urlresolvers.reverse('wagtailimages:chooser')
+        reverse('wagtailimages:chooser')
     )
 
 
@@ -126,7 +126,7 @@ class ImagesSearchArea(SearchArea):
 @hooks.register('register_admin_search_area')
 def register_images_search_area():
     return ImagesSearchArea(
-        _('Images'), urlresolvers.reverse('wagtailimages:index'),
+        _('Images'), reverse('wagtailimages:index'),
         name='images',
         classnames='icon icon-image',
         order=200)
@@ -141,7 +141,7 @@ def register_image_permissions_panel():
 def describe_collection_docs(collection):
     images_count = get_image_model().objects.filter(collection=collection).count()
     if images_count:
-        url = urlresolvers.reverse('wagtailimages:index') + ('?collection_id=%d' % collection.id)
+        url = reverse('wagtailimages:index') + ('?collection_id=%d' % collection.id)
         return {
             'count': images_count,
             'count_text': ungettext(

wagtail/wagtailredirects/tests.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
 
-from django.core.urlresolvers import reverse
 from django.test import TestCase, override_settings
+from django.urls import reverse
 
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.wagtailcore.models import Page, Site

wagtail/wagtailredirects/views.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404, redirect, render
+from django.urls import reverse
 from django.utils.translation import ugettext as _
 from django.views.decorators.vary import vary_on_headers
 

wagtail/wagtailredirects/wagtail_hooks.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.conf.urls import include, url
 from django.contrib.auth.models import Permission
-from django.core import urlresolvers
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from wagtail.wagtailadmin.menu import MenuItem
@@ -28,7 +28,7 @@ class RedirectsMenuItem(MenuItem):
 @hooks.register('register_settings_menu_item')
 def register_redirects_menu_item():
     return RedirectsMenuItem(
-        _('Redirects'), urlresolvers.reverse('wagtailredirects:index'), classnames='icon icon-redirect', order=800
+        _('Redirects'), reverse('wagtailredirects:index'), classnames='icon icon-redirect', order=800
     )
 
 

wagtail/wagtailsearch/index.py

@@ -11,7 +11,6 @@ from django.db.models.fields.related import ForeignObjectRel, OneToOneRel, Relat
 
 from wagtail.wagtailsearch.backends import get_search_backends_with_name
 
-
 logger = logging.getLogger('wagtail.search.index')
 
 

wagtail/wagtailsearch/tests/test_frontend.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.core import paginator
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 
 from wagtail.tests.testapp.models import EventPage
 from wagtail.wagtailcore.models import Page

wagtail/wagtailsearch/tests/test_index_functions.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import, unicode_literals
 
 from datetime import date
-import mock
 
+import mock
 from django.test import TestCase, override_settings
 
 from wagtail.tests.search import models

wagtail/wagtailsites/tests.py

@@ -2,8 +2,8 @@ from __future__ import absolute_import, unicode_literals
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Permission
-from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.urls import reverse
 from django.utils import six
 
 from wagtail.tests.utils import WagtailTestUtils

wagtail/wagtailsites/wagtail_hooks.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.contrib.auth.models import Permission
-from django.core import urlresolvers
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from wagtail.wagtailadmin.menu import MenuItem
@@ -25,7 +25,7 @@ class SitesMenuItem(MenuItem):
 
 @hooks.register('register_settings_menu_item')
 def register_sites_menu_item():
-    return SitesMenuItem(_('Sites'), urlresolvers.reverse('wagtailsites:index'),
+    return SitesMenuItem(_('Sites'), reverse('wagtailsites:index'),
                          classnames='icon icon-site', order=602)
 
 

wagtail/wagtailsnippets/models.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from wagtail.wagtailadmin.utils import get_object_usage
 

wagtail/wagtailsnippets/tests.py

@@ -5,9 +5,9 @@ from django.contrib.auth.models import Permission
 from django.core.exceptions import ValidationError
 from django.core.files.base import ContentFile
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.urls import reverse
 from taggit.models import Tag
 
 from wagtail.tests.snippets.forms import FancySnippetForm

wagtail/wagtailsnippets/views/chooser.py

@@ -2,8 +2,8 @@ from __future__ import absolute_import, unicode_literals
 
 import json
 
-from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404, render
+from django.urls import reverse
 from django.utils.six import text_type
 from django.utils.translation import ugettext as _
 

wagtail/wagtailsnippets/views/snippets.py

@@ -1,9 +1,9 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.apps import apps
-from django.core.urlresolvers import reverse
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
+from django.urls import reverse
 from django.utils.text import capfirst
 from django.utils.translation import ugettext as _
 

wagtail/wagtailsnippets/wagtail_hooks.py

@@ -4,7 +4,7 @@ from django.conf.urls import include, url
 from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.staticfiles.templatetags.staticfiles import static
-from django.core import urlresolvers
+from django.urls import reverse
 from django.utils.html import format_html
 from django.utils.translation import ugettext_lazy as _
 
@@ -31,7 +31,7 @@ class SnippetsMenuItem(MenuItem):
 def register_snippets_menu_item():
     return SnippetsMenuItem(
         _('Snippets'),
-        urlresolvers.reverse('wagtailsnippets:index'),
+        reverse('wagtailsnippets:index'),
         classnames='icon icon-snippet',
         order=500
     )
@@ -45,7 +45,7 @@ def editor_js():
             <script>window.chooserUrls.snippetChooser = '{1}';</script>
         """,
         static('wagtailsnippets/js/snippet-chooser.js'),
-        urlresolvers.reverse('wagtailsnippets:choose_generic')
+        reverse('wagtailsnippets:choose_generic')
     )
 
 

wagtail/wagtailusers/forms.py

@@ -7,8 +7,7 @@ from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
 from django.contrib.auth.password_validation import (
-    password_validators_help_text_html, validate_password
-)
+    password_validators_help_text_html, validate_password)
 from django.db import transaction
 from django.db.models.fields import BLANK_CHOICE_DASH
 from django.template.loader import render_to_string
@@ -23,7 +22,6 @@ from wagtail.wagtailcore.models import (
     UserPagePermissionsProxy)
 from wagtail.wagtailusers.models import UserProfile
 
-
 User = get_user_model()
 
 # The standard fields each user model is expected to have, as a minimum.

wagtail/wagtailusers/templatetags/wagtailusers_tags.py

@@ -3,6 +3,7 @@ from __future__ import absolute_import, unicode_literals
 import itertools
 
 from django import template
+
 from wagtail.wagtailcore import hooks
 
 register = template.Library()

wagtail/wagtailusers/tests.py

@@ -5,8 +5,8 @@ from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
 from django.core.exceptions import ImproperlyConfigured
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.core.urlresolvers import reverse
 from django.test import TestCase, override_settings
+from django.urls import reverse
 from django.utils import six
 
 from wagtail.tests.utils import WagtailTestUtils
@@ -18,7 +18,6 @@ from wagtail.wagtailusers.forms import UserCreationForm, UserEditForm
 from wagtail.wagtailusers.models import UserProfile
 from wagtail.wagtailusers.views.users import get_user_creation_form, get_user_edit_form
 
-
 delete_user_perm_codename = "delete_{0}".format(AUTH_USER_MODEL_NAME.lower())
 change_user_perm_codename = "change_{0}".format(AUTH_USER_MODEL_NAME.lower())
 

wagtail/wagtailusers/utils.py

@@ -2,7 +2,6 @@ from __future__ import absolute_import, unicode_literals
 
 from wagtail.wagtailcore.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME
 
-
 delete_user_perm = "{0}.delete_{1}".format(AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME.lower())
 
 

wagtail/wagtailusers/views/users.py

@@ -3,9 +3,9 @@ from __future__ import absolute_import, unicode_literals
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import reverse
 from django.db.models import Q
 from django.shortcuts import get_object_or_404, redirect, render
+from django.urls import reverse
 from django.utils.module_loading import import_string
 from django.utils.translation import ugettext as _
 from django.views.decorators.vary import vary_on_headers