Skip to content

Refactor else / elif when if block has a raise statement (Sourcery refactored) #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sourcery-ai wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Refactor else / elif when if block has a raise statement (Sourcery refactored) #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0d2f30
Refactor unnecessary `else` / `elif` when `if` block has a `raise` st…
deepsource-autofix[bot] Oct 5, 2021
b7b9f5c
'Refactored by Sourcery'
Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drfaddons/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
22 changes: 9 additions & 13 deletions drfaddons/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Contributor Author

@sourcery-ai sourcery-ai bot Oct 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function DateTimeEncoder.default refactored with the following changes:



class JsonResponse(HttpResponse):
Expand Down Expand Up @@ -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")
)
Copy link
Contributor Author

@sourcery-ai sourcery-ai bot Oct 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function get_client_ip refactored with the following changes:



def validate_email(email):
Expand Down Expand Up @@ -234,18 +230,18 @@ def send_message(
)

# Check if there is any recipient
if not len(recip) > 0:
if not recip:
Comment on lines -237 to +233
Copy link
Contributor Author

@sourcery-ai sourcery-ai bot Oct 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function send_message refactored with the following changes:

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
is_email = validate_email(recip[0])
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
Expand Down