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

5 files changed, 24 insertions, 26 deletions

diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py
index 5dc2a5811b..5c4151c270 100644
--- a/tests/admin_views/admin.py
+++ b/tests/admin_views/admin.py
@@ -5,7 +5,6 @@ from io import StringIO
 from wsgiref.util import FileWrapper
 
 from django import forms
-from django.conf.urls import url
 from django.contrib import admin
 from django.contrib.admin import BooleanFieldListFilter
 from django.contrib.admin.views.main import ChangeList
@@ -17,6 +16,7 @@ from django.core.mail import EmailMessage
 from django.db import models
 from django.forms.models import BaseModelFormSet
 from django.http import HttpResponse, StreamingHttpResponse
+from django.urls import path
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
@@ -704,7 +704,7 @@ class ReportAdmin(admin.ModelAdmin):
 
     def get_urls(self):
         # Corner case: Don't call parent implementation
-        return [url(r'^extra/$', self.extra, name='cable_extra')]
+        return [path('extra/', self.extra, name='cable_extra')]
 
 
 class CustomTemplateBooleanFieldListFilter(BooleanFieldListFilter):
diff --git a/tests/admin_views/customadmin.py b/tests/admin_views/customadmin.py
index 9331918b37..a9d8a060b9 100644
--- a/tests/admin_views/customadmin.py
+++ b/tests/admin_views/customadmin.py
@@ -1,11 +1,11 @@
 """
 A second, custom AdminSite -- see tests.CustomAdminSiteTests.
 """
-from django.conf.urls import url
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.models import User
 from django.http import HttpResponse
+from django.urls import path
 
 from . import admin as base_admin, forms, models
 
@@ -25,7 +25,7 @@ class Admin2(admin.AdminSite):
 
     def get_urls(self):
         return [
-            url(r'^my_view/$', self.admin_view(self.my_view), name='my_view'),
+            path('my_view/', self.admin_view(self.my_view), name='my_view'),
         ] + super().get_urls()
 
     def my_view(self, request):
diff --git a/tests/admin_views/test_adminsite.py b/tests/admin_views/test_adminsite.py
index 86e0a357db..efee6f39c6 100644
--- a/tests/admin_views/test_adminsite.py
+++ b/tests/admin_views/test_adminsite.py
@@ -1,10 +1,9 @@
-from django.conf.urls import url
 from django.contrib import admin
 from django.contrib.admin.actions import delete_selected
 from django.contrib.auth.models import User
 from django.test import SimpleTestCase, TestCase, override_settings
 from django.test.client import RequestFactory
-from django.urls import reverse
+from django.urls import path, reverse
 
 from .models import Article
 
@@ -13,7 +12,7 @@ site.register(User)
 site.register(Article)
 
 urlpatterns = [
-    url(r'^test_admin/admin/', site.urls),
+    path('test_admin/admin/', site.urls),
 ]
 
 
diff --git a/tests/admin_views/test_multidb.py b/tests/admin_views/test_multidb.py
index 9907e16d69..ec3591d1fe 100644
--- a/tests/admin_views/test_multidb.py
+++ b/tests/admin_views/test_multidb.py
@@ -1,11 +1,10 @@
 from unittest import mock
 
-from django.conf.urls import url
 from django.contrib import admin
 from django.contrib.auth.models import User
 from django.db import connections
 from django.test import TestCase, override_settings
-from django.urls import reverse
+from django.urls import path, reverse
 
 from .models import Book
 
@@ -23,7 +22,7 @@ site = admin.AdminSite(name='test_adminsite')
 site.register(Book)
 
 urlpatterns = [
-    url(r'^admin/', site.urls),
+    path('admin/', site.urls),
 ]
 
 
diff --git a/tests/admin_views/urls.py b/tests/admin_views/urls.py
index 545df313e4..fdb61d759d 100644
--- a/tests/admin_views/urls.py
+++ b/tests/admin_views/urls.py
@@ -1,23 +1,23 @@
-from django.conf.urls import include, url
+from django.urls import include, path
 
 from . import admin, custom_has_permission_admin, customadmin, views
 from .test_autocomplete_view import site as autocomplete_site
 
 urlpatterns = [
-    url(r'^test_admin/admin/doc/', include('django.contrib.admindocs.urls')),
-    url(r'^test_admin/admin/secure-view/$', views.secure_view, name='secure_view'),
-    url(r'^test_admin/admin/secure-view2/$', views.secure_view2, name='secure_view2'),
-    url(r'^test_admin/admin/', admin.site.urls),
-    url(r'^test_admin/admin2/', customadmin.site.urls),
-    url(r'^test_admin/admin3/', (admin.site.get_urls(), 'admin', 'admin3'), {'form_url': 'pony'}),
-    url(r'^test_admin/admin4/', customadmin.simple_site.urls),
-    url(r'^test_admin/admin5/', admin.site2.urls),
-    url(r'^test_admin/admin6/', admin.site6.urls),
-    url(r'^test_admin/admin7/', admin.site7.urls),
+    path('test_admin/admin/doc/', include('django.contrib.admindocs.urls')),
+    path('test_admin/admin/secure-view/', views.secure_view, name='secure_view'),
+    path('test_admin/admin/secure-view2/', views.secure_view2, name='secure_view2'),
+    path('test_admin/admin/', admin.site.urls),
+    path('test_admin/admin2/', customadmin.site.urls),
+    path('test_admin/admin3/', (admin.site.get_urls(), 'admin', 'admin3'), {'form_url': 'pony'}),
+    path('test_admin/admin4/', customadmin.simple_site.urls),
+    path('test_admin/admin5/', admin.site2.urls),
+    path('test_admin/admin6/', admin.site6.urls),
+    path('test_admin/admin7/', admin.site7.urls),
     # All admin views accept `extra_context` to allow adding it like this:
-    url(r'^test_admin/admin8/', (admin.site.get_urls(), 'admin', 'admin-extra-context'), {'extra_context': {}}),
-    url(r'^test_admin/admin9/', admin.site9.urls),
-    url(r'^test_admin/admin10/', admin.site10.urls),
-    url(r'^test_admin/has_permission_admin/', custom_has_permission_admin.site.urls),
-    url(r'^test_admin/autocomplete_admin/', autocomplete_site.urls),
+    path('test_admin/admin8/', (admin.site.get_urls(), 'admin', 'admin-extra-context'), {'extra_context': {}}),
+    path('test_admin/admin9/', admin.site9.urls),
+    path('test_admin/admin10/', admin.site10.urls),
+    path('test_admin/has_permission_admin/', custom_has_permission_admin.site.urls),
+    path('test_admin/autocomplete_admin/', autocomplete_site.urls),
 ]