Fixed #26013 -- Moved django.core.urlresolvers to django.urls.

Thanks to Tim Graham for the review.

tests/admin_changelist/tests.py

@@ -10,10 +10,10 @@ from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase
 from django.contrib.admin.views.main import ALL_VAR, SEARCH_VAR, ChangeList
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
-from django.core.urlresolvers import reverse
 from django.template import Context, Template
 from django.test import TestCase, ignore_warnings, override_settings
 from django.test.client import RequestFactory
+from django.urls import reverse
 from django.utils import formats, six
 from django.utils.deprecation import RemovedInDjango20Warning
 

tests/admin_custom_urls/models.py

@@ -1,9 +1,9 @@
 from functools import update_wrapper
 
 from django.contrib import admin
-from django.core.urlresolvers import reverse
 from django.db import models
 from django.http import HttpResponseRedirect
+from django.urls import reverse
 from django.utils.encoding import python_2_unicode_compatible
 
 

tests/admin_custom_urls/tests.py

@@ -4,9 +4,9 @@ import datetime
 
 from django.contrib.admin.utils import quote
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
 from django.template.response import TemplateResponse
 from django.test import TestCase, override_settings
+from django.urls import reverse
 
 from .models import Action, Car, Person
 

tests/admin_docs/tests.py

@@ -7,9 +7,9 @@ from django.contrib.admindocs import utils
 from django.contrib.admindocs.views import get_return_data_type
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
-from django.core.urlresolvers import reverse
 from django.test import TestCase, modify_settings, override_settings
 from django.test.utils import captured_stderr
+from django.urls import reverse
 
 from .models import Company, Person
 

tests/admin_inlines/tests.py

@@ -7,8 +7,8 @@ from django.contrib.admin.helpers import InlineAdminForm
 from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase
 from django.contrib.auth.models import Permission, User
 from django.contrib.contenttypes.models import ContentType
-from django.core.urlresolvers import reverse
 from django.test import RequestFactory, TestCase, override_settings
+from django.urls import reverse
 
 from .admin import InnerInline, site as admin_site
 from .models import (

tests/admin_utils/test_logentry.py

@@ -6,8 +6,8 @@ from django.contrib.admin.models import ADDITION, CHANGE, DELETION, LogEntry
 from django.contrib.admin.utils import quote
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
-from django.core.urlresolvers import reverse
 from django.test import TestCase, override_settings
+from django.urls import reverse
 from django.utils import six
 from django.utils.encoding import force_bytes
 from django.utils.html import escape

tests/admin_views/test_adminsite.py

@@ -5,9 +5,9 @@ import datetime
 from django.conf.urls import url
 from django.contrib import admin
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
 from django.test import TestCase, override_settings
 from django.test.client import RequestFactory
+from django.urls import reverse
 
 from .models import Article
 

tests/admin_views/tests.py

@@ -23,7 +23,6 @@ from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core import mail
 from django.core.checks import Error
 from django.core.files import temp as tempfile
-from django.core.urlresolvers import NoReverseMatch, resolve, reverse
 from django.forms.utils import ErrorList
 from django.template.loader import render_to_string
 from django.template.response import TemplateResponse
@@ -32,6 +31,7 @@ from django.test import (
     override_settings, skipUnlessDBFeature,
 )
 from django.test.utils import override_script_prefix, patch_logger
+from django.urls import NoReverseMatch, resolve, reverse
 from django.utils import formats, six, translation
 from django.utils._os import upath
 from django.utils.cache import get_max_age

tests/admin_widgets/tests.py

@@ -15,9 +15,9 @@ from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase
 from django.contrib.auth.models import User
 from django.core.files.storage import default_storage
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.core.urlresolvers import reverse
 from django.db.models import CharField, DateField
 from django.test import SimpleTestCase, TestCase, override_settings
+from django.urls import reverse
 from django.utils import six, translation
 
 from . import models

tests/auth_tests/test_views.py

@@ -20,12 +20,12 @@ from django.contrib.auth.views import login as login_view, redirect_to_login
 from django.contrib.sessions.middleware import SessionMiddleware
 from django.contrib.sites.requests import RequestSite
 from django.core import mail
-from django.core.urlresolvers import NoReverseMatch, reverse, reverse_lazy
 from django.db import connection
 from django.http import HttpRequest, QueryDict
 from django.middleware.csrf import CsrfViewMiddleware, get_token
 from django.test import TestCase, override_settings
 from django.test.utils import patch_logger
+from django.urls import NoReverseMatch, reverse, reverse_lazy
 from django.utils.encoding import force_text
 from django.utils.http import urlquote
 from django.utils.six.moves.urllib.parse import ParseResult, urlparse

tests/forms_tests/tests/test_widgets.py

@@ -2,7 +2,6 @@
 from __future__ import unicode_literals
 
 from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase
-from django.core.urlresolvers import reverse
 from django.forms import (
     CheckboxSelectMultiple, ClearableFileInput, RadioSelect, TextInput,
 )
@@ -10,6 +9,7 @@ from django.forms.widgets import (
     ChoiceFieldRenderer, ChoiceInput, RadioFieldRenderer,
 )
 from django.test import SimpleTestCase, override_settings
+from django.urls import reverse
 from django.utils import six
 from django.utils.encoding import force_text, python_2_unicode_compatible
 from django.utils.safestring import SafeData

tests/generic_inline_admin/tests.py

@@ -9,12 +9,12 @@ from django.contrib.auth.models import User
 from django.contrib.contenttypes.admin import GenericTabularInline
 from django.contrib.contenttypes.forms import generic_inlineformset_factory
 from django.contrib.contenttypes.models import ContentType
-from django.core.urlresolvers import reverse
 from django.forms.formsets import DEFAULT_MAX_NUM
 from django.forms.models import ModelForm
 from django.test import (
     RequestFactory, SimpleTestCase, TestCase, override_settings,
 )
+from django.urls import reverse
 
 from .admin import MediaInline, MediaPermanentInline, site as admin_site
 from .models import Category, Episode, EpisodePermanent, Media, PhoneNumber

tests/generic_views/models.py

@@ -1,7 +1,7 @@
-from django.core.urlresolvers import reverse
 from django.db import models
 from django.db.models import QuerySet
 from django.db.models.manager import BaseManager
+from django.urls import reverse
 from django.utils.encoding import python_2_unicode_compatible
 
 

tests/generic_views/test_base.py

@@ -4,10 +4,10 @@ import time
 import unittest
 
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import resolve
 from django.http import HttpResponse
 from django.test import RequestFactory, SimpleTestCase, override_settings
 from django.test.utils import require_jinja2
+from django.urls import resolve
 from django.views.generic import RedirectView, TemplateView, View
 
 from . import views

tests/generic_views/test_edit.py

@@ -2,9 +2,9 @@ from __future__ import unicode_literals
 
 from django import forms
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import reverse
 from django.test import SimpleTestCase, TestCase, override_settings
 from django.test.client import RequestFactory
+from django.urls import reverse
 from django.views.generic.base import View
 from django.views.generic.edit import CreateView, FormMixin, ModelFormMixin
 

tests/generic_views/views.py

@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.urls import reverse, reverse_lazy
 from django.utils.decorators import method_decorator
 from django.views import generic
 

tests/i18n/patterns/tests.py

@@ -3,12 +3,12 @@ from __future__ import unicode_literals
 import os
 
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import clear_url_caches, reverse, translate_url
 from django.http import HttpResponsePermanentRedirect
 from django.middleware.locale import LocaleMiddleware
 from django.template import Context, Template
 from django.test import SimpleTestCase, override_settings
 from django.test.utils import override_script_prefix
+from django.urls import clear_url_caches, reverse, translate_url
 from django.utils import translation
 from django.utils._os import upath
 

tests/messages_tests/base.py

@@ -4,8 +4,8 @@ from django.contrib.messages.api import MessageFailure
 from django.contrib.messages.constants import DEFAULT_LEVELS
 from django.contrib.messages.storage import base, default_storage
 from django.contrib.messages.storage.base import Message
-from django.core.urlresolvers import reverse
 from django.test import modify_settings, override_settings
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy
 
 

tests/messages_tests/test_mixins.py

@@ -1,5 +1,5 @@
-from django.core.urlresolvers import reverse
 from django.test import SimpleTestCase, override_settings
+from django.urls import reverse
 
 from .urls import ContactFormViewWithMsg
 

tests/messages_tests/urls.py

@@ -2,10 +2,10 @@ from django import forms
 from django.conf.urls import url
 from django.contrib import messages
 from django.contrib.messages.views import SuccessMessageMixin
-from django.core.urlresolvers import reverse
 from django.http import HttpResponse, HttpResponseRedirect
 from django.template import engines
 from django.template.response import TemplateResponse
+from django.urls import reverse
 from django.views.decorators.cache import never_cache
 from django.views.generic.edit import FormView
 

tests/proxy_models/tests.py

@@ -7,10 +7,10 @@ from django.contrib import admin
 from django.contrib.auth.models import User as AuthUser
 from django.contrib.contenttypes.models import ContentType
 from django.core import checks, management
-from django.core.urlresolvers import reverse
 from django.db import DEFAULT_DB_ALIAS, models
 from django.db.models import signals
 from django.test import TestCase, override_settings
+from django.urls import reverse
 
 from .admin import admin as force_admin_model_registration  # NOQA
 from .models import (

tests/resolve_url/tests.py

@@ -1,9 +1,9 @@
 from __future__ import unicode_literals
 
 from django.contrib.auth.views import logout
-from django.core.urlresolvers import NoReverseMatch, reverse_lazy
 from django.shortcuts import resolve_url
 from django.test import SimpleTestCase, override_settings
+from django.urls import NoReverseMatch, reverse_lazy
 from django.utils import six
 
 from .models import UnimportantThing

tests/sitemaps_tests/models.py

@@ -1,5 +1,5 @@
-from django.core.urlresolvers import reverse
 from django.db import models
+from django.urls import reverse
 
 
 class TestModel(models.Model):

tests/template_tests/syntax_tests/test_url.py

@@ -1,7 +1,7 @@
 # coding: utf-8
-from django.core.urlresolvers import NoReverseMatch, resolve
 from django.template import RequestContext, TemplateSyntaxError
 from django.test import RequestFactory, SimpleTestCase, override_settings
+from django.urls import NoReverseMatch, resolve
 
 from ..utils import setup
 

tests/template_tests/tests.py

@@ -4,10 +4,10 @@ from __future__ import unicode_literals
 import sys
 
 from django.contrib.auth.models import Group
-from django.core import urlresolvers
 from django.template import Context, Engine, TemplateSyntaxError
 from django.template.base import UNKNOWN_SOURCE
 from django.test import SimpleTestCase, override_settings
+from django.urls import NoReverseMatch
 
 
 class TemplateTests(SimpleTestCase):
@@ -26,7 +26,7 @@ class TemplateTests(SimpleTestCase):
         """
         t = Engine(debug=True).from_string('{% url will_not_match %}')
         c = Context()
-        with self.assertRaises(urlresolvers.NoReverseMatch):
+        with self.assertRaises(NoReverseMatch):
             t.render(c)
 
     def test_url_reverse_view_name(self):
@@ -38,7 +38,7 @@ class TemplateTests(SimpleTestCase):
         c = Context()
         try:
             t.render(c)
-        except urlresolvers.NoReverseMatch:
+        except NoReverseMatch:
             tb = sys.exc_info()[2]
             depth = 0
             while tb.tb_next is not None:
@@ -118,7 +118,7 @@ class TemplateTests(SimpleTestCase):
         """
         engine = Engine(app_dirs=True)
         t = engine.get_template('included_content.html')
-        with self.assertRaises(urlresolvers.NoReverseMatch):
+        with self.assertRaises(NoReverseMatch):
             t.render(Context())
 
     def test_debug_tag_non_ascii(self):

tests/test_client/tests.py

@@ -26,11 +26,11 @@ import datetime
 
 from django.contrib.auth.models import User
 from django.core import mail
-from django.core.urlresolvers import reverse_lazy
 from django.http import HttpResponse
 from django.test import (
     Client, RequestFactory, SimpleTestCase, TestCase, override_settings,
 )
+from django.urls import reverse_lazy
 
 from .views import get_view, post_view, trace_view
 

tests/test_client_regress/tests.py

@@ -10,7 +10,6 @@ import os
 
 from django.contrib.auth.models import User
 from django.contrib.auth.signals import user_logged_in, user_logged_out
-from django.core.urlresolvers import NoReverseMatch, reverse
 from django.http import HttpResponse
 from django.template import (
     Context, RequestContext, TemplateSyntaxError, engines,
@@ -21,6 +20,7 @@ from django.test import (
 )
 from django.test.client import RedirectCycleError, RequestFactory, encode_file
 from django.test.utils import ContextList, str_prefix
+from django.urls import NoReverseMatch, reverse
 from django.utils._os import upath
 from django.utils.deprecation import RemovedInDjango20Warning
 from django.utils.translation import ugettext_lazy

tests/test_utils/tests.py

@@ -8,7 +8,6 @@ from django.conf.urls import url
 from django.contrib.staticfiles.finders import get_finder, get_finders
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core.files.storage import default_storage
-from django.core.urlresolvers import NoReverseMatch, reverse
 from django.db import connection, router
 from django.forms import EmailField, IntegerField
 from django.http import HttpResponse
@@ -19,6 +18,7 @@ from django.test import (
 )
 from django.test.html import HTMLParseError, parse_html
 from django.test.utils import CaptureQueriesContext, override_settings
+from django.urls import NoReverseMatch, reverse
 from django.utils import six
 from django.utils._os import abspathu
 from django.utils.deprecation import RemovedInDjango20Warning

tests/timezones/tests.py

@@ -11,7 +11,6 @@ from xml.dom.minidom import parseString
 from django.contrib.auth.models import User
 from django.core import serializers
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import reverse
 from django.db import connection, connections
 from django.db.models import Max, Min
 from django.http import HttpRequest
@@ -23,6 +22,7 @@ from django.test import (
     skipIfDBFeature, skipUnlessDBFeature,
 )
 from django.test.utils import requires_tz_support
+from django.urls import reverse
 from django.utils import six, timezone
 
 from .forms import (

tests/urlpatterns_reverse/middleware.py

@@ -1,5 +1,5 @@
-from django.core.urlresolvers import reverse
 from django.http import HttpResponse, StreamingHttpResponse
+from django.urls import reverse
 
 from . import urlconf_inner
 

tests/urlpatterns_reverse/tests.py

@@ -13,10 +13,6 @@ from django.conf import settings
 from django.conf.urls import include, url
 from django.contrib.auth.models import User
 from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist
-from django.core.urlresolvers import (
-    NoReverseMatch, RegexURLPattern, RegexURLResolver, Resolver404,
-    ResolverMatch, get_callable, get_resolver, resolve, reverse, reverse_lazy,
-)
 from django.http import (
     HttpRequest, HttpResponsePermanentRedirect, HttpResponseRedirect,
 )
@@ -25,6 +21,10 @@ from django.test import (
     SimpleTestCase, TestCase, ignore_warnings, override_settings,
 )
 from django.test.utils import override_script_prefix
+from django.urls import (
+    NoReverseMatch, RegexURLPattern, RegexURLResolver, Resolver404,
+    ResolverMatch, get_callable, get_resolver, resolve, reverse, reverse_lazy,
+)
 from django.utils import six
 from django.utils.deprecation import RemovedInDjango20Warning
 
@@ -458,7 +458,7 @@ class ReverseLazySettingsTest(AdminScriptTestCase):
     """
     def setUp(self):
         self.write_settings('settings.py', extra="""
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 LOGIN_URL = reverse_lazy('login')""")
 
     def tearDown(self):

tests/urlpatterns_reverse/views.py

@@ -1,8 +1,8 @@
 from functools import partial, update_wrapper
 
 from django.contrib.auth.decorators import user_passes_test
-from django.core.urlresolvers import reverse_lazy
 from django.http import HttpResponse
+from django.urls import reverse_lazy
 from django.views.generic import RedirectView
 
 

tests/urlpatterns_reverse/views_broken.py

@@ -1,2 +1,2 @@
 # I just raise an AttributeError to confuse the view loading mechanism
-raise AttributeError('I am here to confuse django.core.urlresolvers.get_callable')
+raise AttributeError('I am here to confuse django.urls.get_callable')

tests/user_commands/management/commands/reverse_url.py

@@ -1,5 +1,5 @@
 from django.core.management.base import BaseCommand
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 
 class Command(BaseCommand):

tests/view_tests/tests/test_debug.py

@@ -13,11 +13,11 @@ from unittest import skipIf
 
 from django.core import mail
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.core.urlresolvers import reverse
 from django.db import DatabaseError, connection
 from django.template import TemplateDoesNotExist
 from django.test import RequestFactory, SimpleTestCase, override_settings
 from django.test.utils import LoggingCaptureMixin
+from django.urls import reverse
 from django.utils import six
 from django.utils.encoding import force_bytes, force_text
 from django.utils.functional import SimpleLazyObject

tests/view_tests/tests/test_i18n.py

@@ -8,11 +8,11 @@ import unittest
 from os import path
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
 from django.test import (
     LiveServerTestCase, SimpleTestCase, TestCase, modify_settings,
     override_settings,
 )
+from django.urls import reverse
 from django.utils import six
 from django.utils._os import upath
 from django.utils.module_loading import import_string

tests/view_tests/views.py

@@ -6,10 +6,10 @@ import logging
 import sys
 
 from django.core.exceptions import PermissionDenied, SuspiciousOperation
-from django.core.urlresolvers import get_resolver
 from django.http import Http404, HttpResponse, JsonResponse
 from django.shortcuts import render
 from django.template import TemplateDoesNotExist
+from django.urls import get_resolver
 from django.views.debug import (
     SafeExceptionReporterFilter, technical_500_response,
 )