From b0d797a84aba07fa160498116c75e26367989ad6 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Wed, 17 Jul 2019 11:32:47 -0700 Subject: [PATCH] Minor yapf and isort changes Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/users/urls.py | 19 +++++++++---------- plinth/web_framework.py | 8 +++++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/plinth/modules/users/urls.py b/plinth/modules/users/urls.py index aa86d69d4..9890a3b29 100644 --- a/plinth/modules/users/urls.py +++ b/plinth/modules/users/urls.py @@ -18,13 +18,13 @@ URLs for the Users module """ +from axes.decorators import axes_dispatch from django.conf.urls import url from django.urls import reverse_lazy +from stronghold.decorators import public -from axes.decorators import axes_dispatch from plinth.modules.sso.views import SSOLoginView, SSOLogoutView from plinth.utils import non_admin_view -from stronghold.decorators import public from . import views @@ -33,8 +33,8 @@ urlpatterns = [ url(r'^sys/users/create/$', views.UserCreate.as_view(), name='create'), url(r'^sys/users/(?P[\w.@+-]+)/edit/$', non_admin_view(views.UserUpdate.as_view()), name='edit'), - url(r'^sys/users/(?P[\w.@+-]+)/delete/$', - views.UserDelete.as_view(), name='delete'), + url(r'^sys/users/(?P[\w.@+-]+)/delete/$', views.UserDelete.as_view(), + name='delete'), url(r'^sys/users/(?P[\w.@+-]+)/change_password/$', non_admin_view(views.UserChangePassword.as_view()), name='change_password'), @@ -43,11 +43,10 @@ urlpatterns = [ # XXX: Use axes authentication backend and middleware instead of # axes_dispatch after axes 5.x becomes available in Debian stable. - url(r'^accounts/login/$', - public(axes_dispatch(SSOLoginView.as_view())), name='login'), - url(r'^accounts/logout/$', - non_admin_view(SSOLogoutView.as_view()), + url(r'^accounts/login/$', public(axes_dispatch(SSOLoginView.as_view())), + name='login'), + url(r'^accounts/logout/$', non_admin_view(SSOLogoutView.as_view()), {'next_page': reverse_lazy('index')}, name='logout'), - url(r'^users/firstboot/$', - public(views.FirstBootView.as_view()), name='firstboot'), + url(r'^users/firstboot/$', public(views.FirstBootView.as_view()), + name='firstboot'), ] diff --git a/plinth/web_framework.py b/plinth/web_framework.py index 6110502e9..a3a01d885 100644 --- a/plinth/web_framework.py +++ b/plinth/web_framework.py @@ -179,13 +179,15 @@ def get_languages(): Add additional languages that FreedomBox support but Django doesn't. """ + def gettext_noop(string): """Django's actual translation methods need Django to be setup.""" return string - return sorted(list(global_settings.LANGUAGES) + [ - ('gu', gettext_noop('Gujarati')), - ]) + return sorted( + list(global_settings.LANGUAGES) + [ + ('gu', gettext_noop('Gujarati')), + ]) def get_wsgi_application():