Updated test URL patterns to use path() and re_path().

6 files changed, 49 insertions, 56 deletions

diff --git a/tests/view_tests/default_urls.py b/tests/view_tests/default_urls.py
index f23a286305..beb2bdc1d4 100644
--- a/tests/view_tests/default_urls.py
+++ b/tests/view_tests/default_urls.py
@@ -1,7 +1,7 @@
-from django.conf.urls import url
 from django.contrib import admin
+from django.urls import path
 
 urlpatterns = [
     # This is the same as in the default project template
-    url(r'^admin/', admin.site.urls),
+    path('admin/', admin.site.urls),
 ]
diff --git a/tests/view_tests/generic_urls.py b/tests/view_tests/generic_urls.py
index 2c40383a2d..8befa86ff5 100644
--- a/tests/view_tests/generic_urls.py
+++ b/tests/view_tests/generic_urls.py
@@ -1,5 +1,5 @@
-from django.conf.urls import url
 from django.contrib.auth import views as auth_views
+from django.urls import path
 from django.views.generic import RedirectView
 
 from . import views
@@ -25,22 +25,20 @@ numeric_days_info_dict = dict(date_based_info_dict, day_format='%d')
 date_based_datefield_info_dict = dict(date_based_info_dict, queryset=DateArticle.objects.all())
 
 urlpatterns = [
-    url(r'^accounts/login/$', auth_views.LoginView.as_view(template_name='login.html')),
-    url(r'^accounts/logout/$', auth_views.LogoutView.as_view()),
+    path('accounts/login/', auth_views.LoginView.as_view(template_name='login.html')),
+    path('accounts/logout/', auth_views.LogoutView.as_view()),
 
     # Special URLs for particular regression cases.
-    url('^中文/target/$', views.index_page),
+    path('中文/target/', views.index_page),
 ]
 
 # redirects, both temporary and permanent, with non-ASCII targets
 urlpatterns += [
-    url('^nonascii_redirect/$', RedirectView.as_view(
-        url='/中文/target/', permanent=False)),
-    url('^permanent_nonascii_redirect/$', RedirectView.as_view(
-        url='/中文/target/', permanent=True)),
+    path('nonascii_redirect/', RedirectView.as_view(url='/中文/target/', permanent=False)),
+    path('permanent_nonascii_redirect/', RedirectView.as_view(url='/中文/target/', permanent=True)),
 ]
 
 # json response
 urlpatterns += [
-    url(r'^json/response/$', views.json_response_view),
+    path('json/response/', views.json_response_view),
 ]
diff --git a/tests/view_tests/regression_21530_urls.py b/tests/view_tests/regression_21530_urls.py
index 706a08c888..c30cd1ed37 100644
--- a/tests/view_tests/regression_21530_urls.py
+++ b/tests/view_tests/regression_21530_urls.py
@@ -1,7 +1,7 @@
-from django.conf.urls import url
+from django.urls import path
 
 from . import views
 
 urlpatterns = [
-    url(r'^index/$', views.index_page, name='index'),
+    path('index/', views.index_page, name='index'),
 ]
diff --git a/tests/view_tests/tests/test_debug.py b/tests/view_tests/tests/test_debug.py
index b411387eac..533d454c69 100644
--- a/tests/view_tests/tests/test_debug.py
+++ b/tests/view_tests/tests/test_debug.py
@@ -7,7 +7,6 @@ import tempfile
 from io import StringIO
 from pathlib import Path
 
-from django.conf.urls import url
 from django.core import mail
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.db import DatabaseError, connection
@@ -15,7 +14,7 @@ from django.shortcuts import render
 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.urls import path, reverse
 from django.utils.functional import SimpleLazyObject
 from django.utils.safestring import mark_safe
 from django.utils.version import PY36
@@ -38,7 +37,7 @@ class User:
 
 
 class WithoutEmptyPathUrls:
-    urlpatterns = [url(r'url/$', index_page, name='url')]
+    urlpatterns = [path('url/', index_page, name='url')]
 
 
 class CallableSettingWrapperTests(SimpleTestCase):
@@ -105,9 +104,6 @@ class DebugViewTests(SimpleTestCase):
     def test_404(self):
         response = self.client.get('/raises404/')
         self.assertEqual(response.status_code, 404)
-
-    def test_raised_404(self):
-        response = self.client.get('/views/raises404/')
         self.assertContains(response, "<code>not-in-urls</code>, didn't match", status_code=404)
 
     def test_404_not_in_urls(self):
@@ -128,12 +124,12 @@ class DebugViewTests(SimpleTestCase):
         self.assertContains(response, "The empty path didn't match any of these.", status_code=404)
 
     def test_technical_404(self):
-        response = self.client.get('/views/technical404/')
+        response = self.client.get('/technical404/')
         self.assertContains(response, "Raised by:", status_code=404)
         self.assertContains(response, "view_tests.views.technical404", status_code=404)
 
     def test_classbased_technical_404(self):
-        response = self.client.get('/views/classbased404/')
+        response = self.client.get('/classbased404/')
         self.assertContains(response, "Raised by:", status_code=404)
         self.assertContains(response, "view_tests.views.Http404View", status_code=404)
 
diff --git a/tests/view_tests/tests/test_i18n.py b/tests/view_tests/tests/test_i18n.py
index 5baa755580..8a56743688 100644
--- a/tests/view_tests/tests/test_i18n.py
+++ b/tests/view_tests/tests/test_i18n.py
@@ -162,7 +162,7 @@ class SetLanguageTests(TestCase):
         """
         The set_language view decodes the HTTP_REFERER URL.
         """
-        # The url() & view must exist for this to work as a regression test.
+        # The URL & view must exist for this to work as a regression test.
         self.assertEqual(reverse('with_parameter', kwargs={'parameter': 'x'}), '/test-setlang/x/')
         lang_code = self._get_inactive_language_code()
         encoded_url = '/test-setlang/%C3%A4/'  # (%C3%A4 decodes to ä)
diff --git a/tests/view_tests/urls.py b/tests/view_tests/urls.py
index c487dd7cb9..34415b06e0 100644
--- a/tests/view_tests/urls.py
+++ b/tests/view_tests/urls.py
@@ -1,9 +1,8 @@
 import os
 from functools import partial
 
-from django.conf.urls import include, url
 from django.conf.urls.i18n import i18n_patterns
-from django.urls import path, re_path
+from django.urls import include, path, re_path
 from django.utils.translation import gettext_lazy as _
 from django.views import defaults, i18n, static
 
@@ -14,57 +13,57 @@ media_dir = os.path.join(base_dir, 'media')
 locale_dir = os.path.join(base_dir, 'locale')
 
 urlpatterns = [
-    url(r'^$', views.index_page),
+    path('', views.index_page),
 
     # Default views
-    url(r'^nonexistent_url/', partial(defaults.page_not_found, exception=None)),
-    url(r'^server_error/', defaults.server_error),
+    path('nonexistent_url/', partial(defaults.page_not_found, exception=None)),
+    path('server_error/', defaults.server_error),
 
     # a view that raises an exception for the debug view
-    url(r'raises/$', views.raises),
+    path('raises/', views.raises),
 
-    url(r'raises400/$', views.raises400),
-    url(r'raises403/$', views.raises403),
-    url(r'raises404/$', views.raises404),
-    url(r'raises500/$', views.raises500),
+    path('raises400/', views.raises400),
+    path('raises403/', views.raises403),
+    path('raises404/', views.raises404),
+    path('raises500/', views.raises500),
 
-    url(r'technical404/$', views.technical404, name="my404"),
-    url(r'classbased404/$', views.Http404View.as_view()),
+    path('technical404/', views.technical404, name='my404'),
+    path('classbased404/', views.Http404View.as_view()),
 
     # i18n views
-    url(r'^i18n/', include('django.conf.urls.i18n')),
-    url(r'^jsi18n/$', i18n.JavaScriptCatalog.as_view(packages=['view_tests'])),
-    url(r'^jsi18n/app1/$', i18n.JavaScriptCatalog.as_view(packages=['view_tests.app1'])),
-    url(r'^jsi18n/app2/$', i18n.JavaScriptCatalog.as_view(packages=['view_tests.app2'])),
-    url(r'^jsi18n/app5/$', i18n.JavaScriptCatalog.as_view(packages=['view_tests.app5'])),
-    url(r'^jsi18n_english_translation/$', i18n.JavaScriptCatalog.as_view(packages=['view_tests.app0'])),
-    url(r'^jsi18n_multi_packages1/$',
-        i18n.JavaScriptCatalog.as_view(packages=['view_tests.app1', 'view_tests.app2'])),
-    url(r'^jsi18n_multi_packages2/$',
-        i18n.JavaScriptCatalog.as_view(packages=['view_tests.app3', 'view_tests.app4'])),
-    url(r'^jsi18n_admin/$',
-        i18n.JavaScriptCatalog.as_view(packages=['django.contrib.admin', 'view_tests'])),
-    url(r'^jsi18n_template/$', views.jsi18n),
-    url(r'^jsi18n_multi_catalogs/$', views.jsi18n_multi_catalogs),
-    url(r'^jsoni18n/$', i18n.JSONCatalog.as_view(packages=['view_tests'])),
+    path('i18n/', include('django.conf.urls.i18n')),
+    path('jsi18n/', i18n.JavaScriptCatalog.as_view(packages=['view_tests'])),
+    path('jsi18n/app1/', i18n.JavaScriptCatalog.as_view(packages=['view_tests.app1'])),
+    path('jsi18n/app2/', i18n.JavaScriptCatalog.as_view(packages=['view_tests.app2'])),
+    path('jsi18n/app5/', i18n.JavaScriptCatalog.as_view(packages=['view_tests.app5'])),
+    path('jsi18n_english_translation/', i18n.JavaScriptCatalog.as_view(packages=['view_tests.app0'])),
+    path('jsi18n_multi_packages1/',
+         i18n.JavaScriptCatalog.as_view(packages=['view_tests.app1', 'view_tests.app2'])),
+    path('jsi18n_multi_packages2/',
+         i18n.JavaScriptCatalog.as_view(packages=['view_tests.app3', 'view_tests.app4'])),
+    path('jsi18n_admin/',
+         i18n.JavaScriptCatalog.as_view(packages=['django.contrib.admin', 'view_tests'])),
+    path('jsi18n_template/', views.jsi18n),
+    path('jsi18n_multi_catalogs/', views.jsi18n_multi_catalogs),
+    path('jsoni18n/', i18n.JSONCatalog.as_view(packages=['view_tests'])),
 
     # Static views
-    url(r'^site_media/(?P<path>.*)$', static.serve, {'document_root': media_dir, 'show_indexes': True}),
+    re_path(r'^site_media/(?P<path>.*)$', static.serve, {'document_root': media_dir, 'show_indexes': True}),
 ]
 
 urlpatterns += i18n_patterns(
-    url(_(r'^translated/$'), views.index_page, name='i18n_prefixed'),
+    re_path(_(r'^translated/$'), views.index_page, name='i18n_prefixed'),
 )
 
 urlpatterns += [
-    url(r'template_exception/$', views.template_exception, name='template_exception'),
-    url(
-        r'^raises_template_does_not_exist/(?P<path>.+)$',
+    path('template_exception/', views.template_exception, name='template_exception'),
+    path(
+        'raises_template_does_not_exist/<path:path>',
         views.raises_template_does_not_exist,
         name='raises_template_does_not_exist'
     ),
-    url(r'^render_no_template/$', views.render_no_template, name='render_no_template'),
-    url(r'^test-setlang/(?P<parameter>[^/]+)/$', views.with_parameter, name='with_parameter'),
+    path('render_no_template/', views.render_no_template, name='render_no_template'),
+    re_path(r'^test-setlang/(?P<parameter>[^/]+)/$', views.with_parameter, name='with_parameter'),
     # Patterns to test the technical 404.
     re_path(r'^regex-post/(?P<pk>[0-9]+)/$', views.index_page, name='regex-post'),
     path('path-post/<int:pk>/', views.index_page, name='path-post'),