From 3f155101af527a5bf67220181c8d7f0307c990c8 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Wed, 1 Mar 2023 19:14:59 +0100 Subject: [PATCH] black on decorators.py --- umap/decorators.py | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/umap/decorators.py b/umap/decorators.py index 8fb7bc95..a0e13171 100644 --- a/umap/decorators.py +++ b/umap/decorators.py @@ -10,17 +10,19 @@ from .models import Map LOGIN_URL = getattr(settings, "LOGIN_URL", "login") -LOGIN_URL = (reverse_lazy(LOGIN_URL) if not LOGIN_URL.startswith("/") - else LOGIN_URL) +LOGIN_URL = reverse_lazy(LOGIN_URL) if not LOGIN_URL.startswith("/") else LOGIN_URL def login_required_if_not_anonymous_allowed(view_func): @wraps(view_func) def wrapper(request, *args, **kwargs): - if (not getattr(settings, "UMAP_ALLOW_ANONYMOUS", False) - and not request.user.is_authenticated): + if ( + not getattr(settings, "UMAP_ALLOW_ANONYMOUS", False) + and not request.user.is_authenticated + ): return simple_json_response(login_required=str(LOGIN_URL)) return view_func(request, *args, **kwargs) + return wrapper @@ -28,11 +30,12 @@ def map_permissions_check(view_func): """ Used for URLs dealing with the map. """ + @wraps(view_func) def wrapper(request, *args, **kwargs): - map_inst = get_object_or_404(Map, pk=kwargs['map_id']) + map_inst = get_object_or_404(Map, pk=kwargs["map_id"]) user = request.user - kwargs['map_inst'] = map_inst # Avoid rerequesting the map in the view + kwargs["map_inst"] = map_inst # Avoid rerequesting the map in the view if map_inst.edit_status >= map_inst.EDITORS: can_edit = map_inst.can_edit(user=user, request=request) if not can_edit: @@ -40,6 +43,7 @@ def map_permissions_check(view_func): return simple_json_response(login_required=str(LOGIN_URL)) return HttpResponseForbidden() return view_func(request, *args, **kwargs) + return wrapper @@ -48,9 +52,10 @@ def jsonize_view(view_func): def wrapper(request, *args, **kwargs): response = view_func(request, *args, **kwargs) response_kwargs = {} - if hasattr(response, 'rendered_content'): - response_kwargs['html'] = response.rendered_content - if response.has_header('location'): - response_kwargs['redirect'] = response['location'] + if hasattr(response, "rendered_content"): + response_kwargs["html"] = response.rendered_content + if response.has_header("location"): + response_kwargs["redirect"] = response["location"] return simple_json_response(**response_kwargs) + return wrapper