diff options
Diffstat (limited to 'django/contrib/auth')
| -rw-r--r-- | django/contrib/auth/admin.py | 7 | ||||
| -rw-r--r-- | django/contrib/auth/urls.py | 19 |
2 files changed, 12 insertions, 14 deletions
diff --git a/django/contrib/auth/admin.py b/django/contrib/auth/admin.py index 3661d226a7..41df65a72e 100644 --- a/django/contrib/auth/admin.py +++ b/django/contrib/auth/admin.py @@ -1,5 +1,4 @@ from django.conf import settings -from django.conf.urls import url from django.contrib import admin, messages from django.contrib.admin.options import IS_POPUP_VAR from django.contrib.admin.utils import unquote @@ -12,7 +11,7 @@ from django.core.exceptions import PermissionDenied from django.db import router, transaction from django.http import Http404, HttpResponseRedirect from django.template.response import TemplateResponse -from django.urls import reverse +from django.urls import path, reverse from django.utils.decorators import method_decorator from django.utils.html import escape from django.utils.translation import gettext, gettext_lazy as _ @@ -81,8 +80,8 @@ class UserAdmin(admin.ModelAdmin): def get_urls(self): return [ - url( - r'^(.+)/password/$', + path( + '<id>/password/', self.admin_site.admin_view(self.user_change_password), name='auth_user_password_change', ), diff --git a/django/contrib/auth/urls.py b/django/contrib/auth/urls.py index 233eef8fec..c3306807e5 100644 --- a/django/contrib/auth/urls.py +++ b/django/contrib/auth/urls.py @@ -3,19 +3,18 @@ # It is also provided as a convenience to those who want to deploy these URLs # elsewhere. -from django.conf.urls import url from django.contrib.auth import views +from django.urls import path urlpatterns = [ - url(r'^login/$', views.LoginView.as_view(), name='login'), - url(r'^logout/$', views.LogoutView.as_view(), name='logout'), + path('login/', views.LoginView.as_view(), name='login'), + path('logout/', views.LogoutView.as_view(), name='logout'), - url(r'^password_change/$', views.PasswordChangeView.as_view(), name='password_change'), - url(r'^password_change/done/$', views.PasswordChangeDoneView.as_view(), name='password_change_done'), + path('password_change/', views.PasswordChangeView.as_view(), name='password_change'), + path('password_change/done/', views.PasswordChangeDoneView.as_view(), name='password_change_done'), - url(r'^password_reset/$', views.PasswordResetView.as_view(), name='password_reset'), - url(r'^password_reset/done/$', views.PasswordResetDoneView.as_view(), name='password_reset_done'), - url(r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', - views.PasswordResetConfirmView.as_view(), name='password_reset_confirm'), - url(r'^reset/done/$', views.PasswordResetCompleteView.as_view(), name='password_reset_complete'), + path('password_reset/', views.PasswordResetView.as_view(), name='password_reset'), + path('password_reset/done/', views.PasswordResetDoneView.as_view(), name='password_reset_done'), + path('reset/<uidb64>/<token>/', views.PasswordResetConfirmView.as_view(), name='password_reset_confirm'), + path('reset/done/', views.PasswordResetCompleteView.as_view(), name='password_reset_complete'), ] |