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

5 files changed, 57 insertions, 49 deletions

diff --git a/tests/auth_tests/test_admin_multidb.py b/tests/auth_tests/test_admin_multidb.py
index f86ea86dd8..eff458de19 100644
--- a/tests/auth_tests/test_admin_multidb.py
+++ b/tests/auth_tests/test_admin_multidb.py
@@ -1,12 +1,11 @@
 from unittest import mock
 
-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.db import connections
 from django.test import TestCase, override_settings
-from django.urls import reverse
+from django.urls import path, reverse
 
 
 class Router:
@@ -22,7 +21,7 @@ site = admin.AdminSite(name='test_adminsite')
 site.register(User, admin_class=UserAdmin)
 
 urlpatterns = [
-    url(r'^admin/', site.urls),
+    path('admin/', site.urls),
 ]
 
 
diff --git a/tests/auth_tests/test_views.py b/tests/auth_tests/test_views.py
index d4311a0fad..4949ce1bf4 100644
--- a/tests/auth_tests/test_views.py
+++ b/tests/auth_tests/test_views.py
@@ -319,7 +319,7 @@ class PasswordResetTest(AuthViewsTestCase):
         ]
     )
     def test_confirm_login_post_reset_custom_backend(self):
-        # This backend is specified in the url().
+        # This backend is specified in the URL pattern.
         backend = 'django.contrib.auth.backends.AllowAllUsersModelBackend'
         url, path = self._test_confirm_start()
         path = path.replace('/reset/', '/reset/post_reset_login_custom_backend/')
diff --git a/tests/auth_tests/urls.py b/tests/auth_tests/urls.py
index 9dc23cee88..d0b259935b 100644
--- a/tests/auth_tests/urls.py
+++ b/tests/auth_tests/urls.py
@@ -1,4 +1,3 @@
-from django.conf.urls import url
 from django.contrib import admin
 from django.contrib.auth import views
 from django.contrib.auth.decorators import login_required, permission_required
@@ -8,7 +7,7 @@ from django.contrib.messages.api import info
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import render
 from django.template import RequestContext, Template
-from django.urls import path, reverse_lazy
+from django.urls import path, re_path, reverse_lazy
 from django.views.decorators.cache import never_cache
 
 
@@ -82,63 +81,73 @@ uid_token = r'(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z
 
 # special urls for auth test cases
 urlpatterns = auth_urlpatterns + [
-    url(r'^logout/custom_query/$', views.LogoutView.as_view(redirect_field_name='follow')),
-    url(r'^logout/next_page/$', views.LogoutView.as_view(next_page='/somewhere/')),
-    url(r'^logout/next_page/named/$', views.LogoutView.as_view(next_page='password_reset')),
-    url(r'^logout/allowed_hosts/$', views.LogoutView.as_view(success_url_allowed_hosts={'otherserver'})),
-    url(r'^remote_user/$', remote_user_auth_view),
+    path('logout/custom_query/', views.LogoutView.as_view(redirect_field_name='follow')),
+    path('logout/next_page/', views.LogoutView.as_view(next_page='/somewhere/')),
+    path('logout/next_page/named/', views.LogoutView.as_view(next_page='password_reset')),
+    path('logout/allowed_hosts/', views.LogoutView.as_view(success_url_allowed_hosts={'otherserver'})),
+    path('remote_user/', remote_user_auth_view),
 
-    url(r'^password_reset_from_email/$',
-        views.PasswordResetView.as_view(from_email='staffmember@example.com')),
-    url(r'^password_reset_extra_email_context/$',
+    path('password_reset_from_email/', views.PasswordResetView.as_view(from_email='staffmember@example.com')),
+    path(
+        'password_reset_extra_email_context/',
         views.PasswordResetView.as_view(extra_email_context={'greeting': 'Hello!'})),
-    url(r'^password_reset/custom_redirect/$',
+    path(
+        'password_reset/custom_redirect/',
         views.PasswordResetView.as_view(success_url='/custom/')),
-    url(r'^password_reset/custom_redirect/named/$',
+    path(
+        'password_reset/custom_redirect/named/',
         views.PasswordResetView.as_view(success_url=reverse_lazy('password_reset'))),
-    url(r'^password_reset/html_email_template/$',
+    path(
+        'password_reset/html_email_template/',
         views.PasswordResetView.as_view(
             html_email_template_name='registration/html_password_reset_email.html'
         )),
-    url(r'^reset/custom/{}/$'.format(uid_token),
-        views.PasswordResetConfirmView.as_view(success_url='/custom/')),
-    url(r'^reset/custom/named/{}/$'.format(uid_token),
-        views.PasswordResetConfirmView.as_view(success_url=reverse_lazy('password_reset'))),
-    url(r'^reset/post_reset_login/{}/$'.format(uid_token),
-        views.PasswordResetConfirmView.as_view(post_reset_login=True)),
-    url(
-        r'^reset/post_reset_login_custom_backend/{}/$'.format(uid_token),
+    re_path(
+        '^reset/custom/{}/$'.format(uid_token),
+        views.PasswordResetConfirmView.as_view(success_url='/custom/'),
+    ),
+    re_path(
+        '^reset/custom/named/{}/$'.format(uid_token),
+        views.PasswordResetConfirmView.as_view(success_url=reverse_lazy('password_reset')),
+    ),
+    re_path(
+        '^reset/post_reset_login/{}/$'.format(uid_token),
+        views.PasswordResetConfirmView.as_view(post_reset_login=True),
+    ),
+    re_path(
+        '^reset/post_reset_login_custom_backend/{}/$'.format(uid_token),
         views.PasswordResetConfirmView.as_view(
             post_reset_login=True,
             post_reset_login_backend='django.contrib.auth.backends.AllowAllUsersModelBackend',
         ),
     ),
-    url(r'^password_change/custom/$',
-        views.PasswordChangeView.as_view(success_url='/custom/')),
-    url(r'^password_change/custom/named/$',
-        views.PasswordChangeView.as_view(success_url=reverse_lazy('password_reset'))),
-    url(r'^login_required/$', login_required(views.PasswordResetView.as_view())),
-    url(r'^login_required_login_url/$', login_required(views.PasswordResetView.as_view(), login_url='/somewhere/')),
+    path('password_change/custom/',
+         views.PasswordChangeView.as_view(success_url='/custom/')),
+    path('password_change/custom/named/',
+         views.PasswordChangeView.as_view(success_url=reverse_lazy('password_reset'))),
+    path('login_required/', login_required(views.PasswordResetView.as_view())),
+    path('login_required_login_url/', login_required(views.PasswordResetView.as_view(), login_url='/somewhere/')),
 
-    url(r'^auth_processor_no_attr_access/$', auth_processor_no_attr_access),
-    url(r'^auth_processor_attr_access/$', auth_processor_attr_access),
-    url(r'^auth_processor_user/$', auth_processor_user),
-    url(r'^auth_processor_perms/$', auth_processor_perms),
-    url(r'^auth_processor_perm_in_perms/$', auth_processor_perm_in_perms),
-    url(r'^auth_processor_messages/$', auth_processor_messages),
-    url(r'^custom_request_auth_login/$',
+    path('auth_processor_no_attr_access/', auth_processor_no_attr_access),
+    path('auth_processor_attr_access/', auth_processor_attr_access),
+    path('auth_processor_user/', auth_processor_user),
+    path('auth_processor_perms/', auth_processor_perms),
+    path('auth_processor_perm_in_perms/', auth_processor_perm_in_perms),
+    path('auth_processor_messages/', auth_processor_messages),
+    path(
+        'custom_request_auth_login/',
         views.LoginView.as_view(authentication_form=CustomRequestAuthenticationForm)),
-    url(r'^userpage/(.+)/$', userpage, name="userpage"),
-    url(r'^login/redirect_authenticated_user_default/$', views.LoginView.as_view()),
-    url(r'^login/redirect_authenticated_user/$',
-        views.LoginView.as_view(redirect_authenticated_user=True)),
-    url(r'^login/allowed_hosts/$',
-        views.LoginView.as_view(success_url_allowed_hosts={'otherserver'})),
+    re_path('^userpage/(.+)/$', userpage, name='userpage'),
+    path('login/redirect_authenticated_user_default/', views.LoginView.as_view()),
+    path('login/redirect_authenticated_user/',
+         views.LoginView.as_view(redirect_authenticated_user=True)),
+    path('login/allowed_hosts/',
+         views.LoginView.as_view(success_url_allowed_hosts={'otherserver'})),
 
     path('permission_required_redirect/', permission_required_redirect),
     path('permission_required_exception/', permission_required_exception),
     path('login_and_permission_required_exception/', login_and_permission_required_exception),
 
     # This line is only required to render the password reset with is_admin=True
-    url(r'^admin/', admin.site.urls),
+    path('admin/', admin.site.urls),
 ]
diff --git a/tests/auth_tests/urls_admin.py b/tests/auth_tests/urls_admin.py
index 8e5b0f1f0c..21b0073210 100644
--- a/tests/auth_tests/urls_admin.py
+++ b/tests/auth_tests/urls_admin.py
@@ -2,11 +2,11 @@
 Test URLs for auth admins.
 """
 
-from django.conf.urls import url
 from django.contrib import admin
 from django.contrib.auth.admin import GroupAdmin, UserAdmin
 from django.contrib.auth.models import Group, User
 from django.contrib.auth.urls import urlpatterns
+from django.urls import path
 
 # Create a silo'd admin site for just the user/group admins.
 site = admin.AdminSite(name='auth_test_admin')
@@ -14,5 +14,5 @@ site.register(User, UserAdmin)
 site.register(Group, GroupAdmin)
 
 urlpatterns += [
-    url(r'^admin/', site.urls),
+    path('admin/', site.urls),
 ]
diff --git a/tests/auth_tests/urls_custom_user_admin.py b/tests/auth_tests/urls_custom_user_admin.py
index 59b80d04d7..83d93d5cfe 100644
--- a/tests/auth_tests/urls_custom_user_admin.py
+++ b/tests/auth_tests/urls_custom_user_admin.py
@@ -1,7 +1,7 @@
-from django.conf.urls import url
 from django.contrib import admin
 from django.contrib.auth import get_user_model
 from django.contrib.auth.admin import UserAdmin
+from django.urls import path
 
 site = admin.AdminSite(name='custom_user_admin')
 
@@ -19,5 +19,5 @@ class CustomUserAdmin(UserAdmin):
 site.register(get_user_model(), CustomUserAdmin)
 
 urlpatterns = [
-    url(r'^admin/', site.urls),
+    path('admin/', site.urls),
 ]