From 38d2f0dd928daf2a70934ea766d363c127f7fc51 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Tue, 14 Sep 2021 15:52:03 +0200 Subject: [PATCH] Clean up with black --- ivatar/ivataraccount/urls.py | 215 ++++++++++++++++++++--------------- 1 file changed, 126 insertions(+), 89 deletions(-) diff --git a/ivatar/ivataraccount/urls.py b/ivatar/ivataraccount/urls.py index f3bfbfa..e15c88d 100644 --- a/ivatar/ivataraccount/urls.py +++ b/ivatar/ivataraccount/urls.py @@ -1,119 +1,156 @@ -''' +# -*- coding: utf-8 -*- +""" URLs for ivatar.ivataraccount -''' +""" from django.urls import path from django.conf.urls import url from django.views.generic import TemplateView from django.contrib.auth.views import LogoutView -from django.contrib.auth.views import PasswordResetDoneView,\ - PasswordResetConfirmView, PasswordResetCompleteView +from django.contrib.auth.views import ( + PasswordResetDoneView, + PasswordResetConfirmView, + PasswordResetCompleteView, +) from django.contrib.auth.views import PasswordChangeView, PasswordChangeDoneView from django.contrib.auth.decorators import login_required -from . views import ProfileView, PasswordResetView -from . views import CreateView, PasswordSetView, AddEmailView -from . views import RemoveUnconfirmedEmailView, ConfirmEmailView -from . views import RemoveConfirmedEmailView, AssignPhotoEmailView -from . views import RemoveUnconfirmedOpenIDView, RemoveConfirmedOpenIDView -from . views import ImportPhotoView, RawImageView, DeletePhotoView -from . views import UploadPhotoView, AssignPhotoOpenIDView -from . views import AddOpenIDView, RedirectOpenIDView, ConfirmOpenIDView -from . views import CropPhotoView -from . views import UserPreferenceView, UploadLibravatarExportView -from . views import ResendConfirmationMailView -from . views import IvatarLoginView -from . views import DeleteAccountView +from .views import ProfileView, PasswordResetView +from .views import CreateView, PasswordSetView, AddEmailView +from .views import RemoveUnconfirmedEmailView, ConfirmEmailView +from .views import RemoveConfirmedEmailView, AssignPhotoEmailView +from .views import RemoveUnconfirmedOpenIDView, RemoveConfirmedOpenIDView +from .views import ImportPhotoView, RawImageView, DeletePhotoView +from .views import UploadPhotoView, AssignPhotoOpenIDView +from .views import AddOpenIDView, RedirectOpenIDView, ConfirmOpenIDView +from .views import CropPhotoView +from .views import UserPreferenceView, UploadLibravatarExportView +from .views import ResendConfirmationMailView +from .views import IvatarLoginView +from .views import DeleteAccountView # Define URL patterns, self documenting # To see the fancy, colorful evaluation of these use: # ./manager show_urls urlpatterns = [ # pylint: disable=invalid-name - path('new/', CreateView.as_view(), name='new_account'), - path('login/', IvatarLoginView.as_view(), name='login'), + path("new/", CreateView.as_view(), name="new_account"), + path("login/", IvatarLoginView.as_view(), name="login"), + path("logout/", LogoutView.as_view(next_page="/"), name="logout"), path( - 'logout/', LogoutView.as_view(next_page='/'), - name='logout'), - - path('password_change/', - PasswordChangeView.as_view(template_name='password_change.html'), - name='password_change'), - path('password_change/done/', - PasswordChangeDoneView.as_view(template_name='password_change_done.html'), - name='password_change_done'), - - path('password_reset/', - PasswordResetView.as_view(template_name='password_reset.html'), - name='password_reset'), - path('password_reset/done/', - PasswordResetDoneView.as_view( - template_name='password_reset_submitted.html'), - name='password_reset_done'), - path('reset///', - PasswordResetConfirmView.as_view( - template_name='password_change.html'), - name='password_reset_confirm'), - path('reset/done/', - PasswordResetCompleteView.as_view( - template_name='password_change_done.html'), - name='password_reset_complete'), - - path('export/', login_required( - TemplateView.as_view(template_name='export.html') - ), name='export'), - path('delete/', DeleteAccountView.as_view(), name='delete'), - path('profile/', ProfileView.as_view(), name='profile'), - url('profile/(?P.+)', ProfileView.as_view(), name='profile_with_profile_username'), - path('add_email/', AddEmailView.as_view(), name='add_email'), - path('add_openid/', AddOpenIDView.as_view(), name='add_openid'), - path('upload_photo/', UploadPhotoView.as_view(), name='upload_photo'), - path('password_set/', PasswordSetView.as_view(), name='password_set'), + "password_change/", + PasswordChangeView.as_view(template_name="password_change.html"), + name="password_change", + ), + path( + "password_change/done/", + PasswordChangeDoneView.as_view(template_name="password_change_done.html"), + name="password_change_done", + ), + path( + "password_reset/", + PasswordResetView.as_view(template_name="password_reset.html"), + name="password_reset", + ), + path( + "password_reset/done/", + PasswordResetDoneView.as_view(template_name="password_reset_submitted.html"), + name="password_reset_done", + ), + path( + "reset///", + PasswordResetConfirmView.as_view(template_name="password_change.html"), + name="password_reset_confirm", + ), + path( + "reset/done/", + PasswordResetCompleteView.as_view(template_name="password_change_done.html"), + name="password_reset_complete", + ), + path( + "export/", + login_required(TemplateView.as_view(template_name="export.html")), + name="export", + ), + path("delete/", DeleteAccountView.as_view(), name="delete"), + path("profile/", ProfileView.as_view(), name="profile"), url( - r'remove_unconfirmed_openid/(?P\d+)', + "profile/(?P.+)", + ProfileView.as_view(), + name="profile_with_profile_username", + ), + path("add_email/", AddEmailView.as_view(), name="add_email"), + path("add_openid/", AddOpenIDView.as_view(), name="add_openid"), + path("upload_photo/", UploadPhotoView.as_view(), name="upload_photo"), + path("password_set/", PasswordSetView.as_view(), name="password_set"), + url( + r"remove_unconfirmed_openid/(?P\d+)", RemoveUnconfirmedOpenIDView.as_view(), - name='remove_unconfirmed_openid'), + name="remove_unconfirmed_openid", + ), url( - r'remove_confirmed_openid/(?P\d+)', - RemoveConfirmedOpenIDView.as_view(), name='remove_confirmed_openid'), + r"remove_confirmed_openid/(?P\d+)", + RemoveConfirmedOpenIDView.as_view(), + name="remove_confirmed_openid", + ), url( - r'openid_redirection/(?P\d+)', - RedirectOpenIDView.as_view(), name='openid_redirection'), + r"openid_redirection/(?P\d+)", + RedirectOpenIDView.as_view(), + name="openid_redirection", + ), url( - r'confirm_openid/(?P\w+)', - ConfirmOpenIDView.as_view(), name='confirm_openid'), + r"confirm_openid/(?P\w+)", + ConfirmOpenIDView.as_view(), + name="confirm_openid", + ), url( - r'confirm_email/(?P\w+)', - ConfirmEmailView.as_view(), name='confirm_email'), + r"confirm_email/(?P\w+)", + ConfirmEmailView.as_view(), + name="confirm_email", + ), url( - r'remove_unconfirmed_email/(?P\d+)', - RemoveUnconfirmedEmailView.as_view(), name='remove_unconfirmed_email'), + r"remove_unconfirmed_email/(?P\d+)", + RemoveUnconfirmedEmailView.as_view(), + name="remove_unconfirmed_email", + ), url( - r'remove_confirmed_email/(?P\d+)', - RemoveConfirmedEmailView.as_view(), name='remove_confirmed_email'), + r"remove_confirmed_email/(?P\d+)", + RemoveConfirmedEmailView.as_view(), + name="remove_confirmed_email", + ), url( - r'assign_photo_email/(?P\d+)', - AssignPhotoEmailView.as_view(), name='assign_photo_email'), + r"assign_photo_email/(?P\d+)", + AssignPhotoEmailView.as_view(), + name="assign_photo_email", + ), url( - r'assign_photo_openid/(?P\d+)', - AssignPhotoOpenIDView.as_view(), name='assign_photo_openid'), + r"assign_photo_openid/(?P\d+)", + AssignPhotoOpenIDView.as_view(), + name="assign_photo_openid", + ), + url(r"import_photo/$", ImportPhotoView.as_view(), name="import_photo"), url( - r'import_photo/$', - ImportPhotoView.as_view(), name='import_photo'), + r"import_photo/(?P[\w.+-]+@[\w.]+.[\w.]+)", + ImportPhotoView.as_view(), + name="import_photo", + ), url( - r'import_photo/(?P[\w.+-]+@[\w.]+.[\w.]+)', - ImportPhotoView.as_view(), name='import_photo'), + r"import_photo/(?P\d+)", + ImportPhotoView.as_view(), + name="import_photo", + ), + url(r"delete_photo/(?P\d+)", DeletePhotoView.as_view(), name="delete_photo"), + url(r"raw_image/(?P\d+)", RawImageView.as_view(), name="raw_image"), + url(r"crop_photo/(?P\d+)", CropPhotoView.as_view(), name="crop_photo"), + url(r"pref/$", UserPreferenceView.as_view(), name="user_preference"), + url(r"upload_export/$", UploadLibravatarExportView.as_view(), name="upload_export"), url( - r'import_photo/(?P\d+)', - ImportPhotoView.as_view(), name='import_photo'), + r"upload_export/(?Psave)$", + UploadLibravatarExportView.as_view(), + name="upload_export", + ), url( - r'delete_photo/(?P\d+)', - DeletePhotoView.as_view(), name='delete_photo'), - url(r'raw_image/(?P\d+)', RawImageView.as_view(), name='raw_image'), - url(r'crop_photo/(?P\d+)', CropPhotoView.as_view(), name='crop_photo'), - url(r'pref/$', UserPreferenceView.as_view(), name='user_preference'), - url(r'upload_export/$', UploadLibravatarExportView.as_view(), name='upload_export'), - url(r'upload_export/(?Psave)$', - UploadLibravatarExportView.as_view(), name='upload_export'), - url(r'resend_confirmation_mail/(?P\d+)', - ResendConfirmationMailView.as_view(), name='resend_confirmation_mail'), + r"resend_confirmation_mail/(?P\d+)", + ResendConfirmationMailView.as_view(), + name="resend_confirmation_mail", + ), ]