From b0d2f304d65e126f2cd1ba48acb17faa06dce421 Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Tue, 5 Oct 2021 08:56:54 +0530 Subject: [PATCH 1/2] Refactor unnecessary `else` / `elif` when `if` block has a `raise` statement (#1) Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com> --- drfaddons/auth.py | 2 +- drfaddons/utils.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drfaddons/auth.py b/drfaddons/auth.py index 52d6b8d..009282f 100644 --- a/drfaddons/auth.py +++ b/drfaddons/auth.py @@ -91,7 +91,7 @@ def get_jwt_value(self, request): msg = _("Invalid Authorization header. No credentials provided.") raise exceptions.AuthenticationFailed(msg) - elif len(auth) > 2: + if len(auth) > 2: msg = _( "Invalid Authorization header. Credentials string " "should not contain spaces." diff --git a/drfaddons/utils.py b/drfaddons/utils.py index dba4e01..41ccd5b 100644 --- a/drfaddons/utils.py +++ b/drfaddons/utils.py @@ -237,7 +237,7 @@ def send_message( if not len(recip) > 0: raise ValueError("No recipient to send message.") # Check if the value of recipient is valid (min length: a@b.c) - elif len(recip[0]) < 5: + if len(recip[0]) < 5: raise ValueError("Invalid recipient.") # Check if all recipient in list are of same type @@ -245,7 +245,7 @@ def send_message( for ind in range(len(recip)): if validate_email(recip[ind]) is not is_email: raise ValueError("All recipient should be of same type.") - elif not is_email: + if not is_email: recip[ind] = get_mobile_number(recip[ind]) # Check if fallback email is indeed an email From b7b9f5c1ca8cf416f39931212849052f7c04c431 Mon Sep 17 00:00:00 2001 From: Sourcery AI <> Date: Tue, 5 Oct 2021 03:28:24 +0000 Subject: [PATCH 2/2] 'Refactored by Sourcery' --- drfaddons/utils.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/drfaddons/utils.py b/drfaddons/utils.py index 41ccd5b..818980a 100644 --- a/drfaddons/utils.py +++ b/drfaddons/utils.py @@ -30,11 +30,7 @@ class DateTimeEncoder(json.JSONEncoder): def default(self, obj): - if isinstance(obj, datetime): - encoded_object = obj.strftime("%s") - else: - encoded_object = super(self, obj) - return encoded_object + return obj.strftime("%s") if isinstance(obj, datetime) else super(self, obj) class JsonResponse(HttpResponse): @@ -80,11 +76,11 @@ def get_client_ip(request): ip: str """ x_forwarded_for = request.META.get("HTTP_X_FORWARDED_FOR") - if x_forwarded_for: - ip = x_forwarded_for.split(",")[0] - else: - ip = request.META.get("REMOTE_ADDR") - return ip + return ( + x_forwarded_for.split(",")[0] + if x_forwarded_for + else request.META.get("REMOTE_ADDR") + ) def validate_email(email): @@ -234,7 +230,7 @@ def send_message( ) # Check if there is any recipient - if not len(recip) > 0: + if not recip: raise ValueError("No recipient to send message.") # Check if the value of recipient is valid (min length: a@b.c) if len(recip[0]) < 5: