diff --git a/social_core/backends/evernote.py b/social_core/backends/evernote.py index 7147e2dcc..10e0b13f7 100644 --- a/social_core/backends/evernote.py +++ b/social_core/backends/evernote.py @@ -53,8 +53,7 @@ def access_token(self, token): # Evernote returns a 401 error when AuthCanceled if err.response.status_code == 401: raise AuthCanceled(self, response=err.response) - else: - raise + raise def extra_data(self, user, uid, response, details=None, *args, **kwargs): data = super().extra_data(user, uid, response, details, *args, **kwargs) diff --git a/social_core/backends/facebook.py b/social_core/backends/facebook.py index c495b1d18..69bc53b96 100644 --- a/social_core/backends/facebook.py +++ b/social_core/backends/facebook.py @@ -204,8 +204,7 @@ def auth_complete(self, *args, **kwargs): if access_token is None: if self.data.get("error") == "access_denied": raise AuthCanceled(self) - else: - raise AuthException(self) + raise AuthException(self) return self.do_auth(access_token, response, *args, **kwargs) def auth_html(self): diff --git a/social_core/backends/jawbone.py b/social_core/backends/jawbone.py index ca77f42dd..89bdca05d 100644 --- a/social_core/backends/jawbone.py +++ b/social_core/backends/jawbone.py @@ -47,8 +47,7 @@ def process_error(self, data): if error: if error == "access_denied": raise AuthCanceled(self) - else: - raise AuthUnknownError(self, f"Jawbone error was {error}") + raise AuthUnknownError(self, f"Jawbone error was {error}") return super().process_error(data) def auth_complete_params(self, state=None): diff --git a/social_core/backends/oauth.py b/social_core/backends/oauth.py index 4d724ef9c..4668a373e 100644 --- a/social_core/backends/oauth.py +++ b/social_core/backends/oauth.py @@ -97,12 +97,11 @@ def validate_state(self): request_state = self.get_request_state() if not request_state: raise AuthMissingParameter(self, "state") - elif not state: + if not state: raise AuthStateMissing(self, "state") - elif not constant_time_compare(request_state, state): + if not constant_time_compare(request_state, state): raise AuthStateForbidden(self) - else: - return state + return state def get_redirect_uri(self, state=None): """Build redirect with redirect_state parameter.""" @@ -401,7 +400,7 @@ def process_error(self, data): if "denied" in data["error"] or "cancelled" in data["error"]: raise AuthCanceled(self, data.get("error_description", "")) raise AuthFailed(self, data.get("error_description") or data["error"]) - elif "denied" in data: + if "denied" in data: raise AuthCanceled(self, data["denied"]) @handle_http_errors diff --git a/social_core/backends/open_id.py b/social_core/backends/open_id.py index a2533d4b8..064d37e3a 100644 --- a/social_core/backends/open_id.py +++ b/social_core/backends/open_id.py @@ -183,11 +183,11 @@ def auth_complete(self, *args, **kwargs): def process_error(self, data): if not data: raise AuthException(self, "OpenID relying party endpoint") - elif data.status == FAILURE: + if data.status == FAILURE: raise AuthFailed(self, data.message) - elif data.status == CANCEL: + if data.status == CANCEL: raise AuthCanceled(self) - elif data.status != SUCCESS: + if data.status != SUCCESS: raise AuthUnknownError(self, data.status) def setup_request(self, params=None): diff --git a/social_core/backends/twitter.py b/social_core/backends/twitter.py index 669c89f74..661608597 100644 --- a/social_core/backends/twitter.py +++ b/social_core/backends/twitter.py @@ -22,8 +22,7 @@ class TwitterOAuth(BaseOAuth1): def process_error(self, data): if "denied" in data: raise AuthCanceled(self) - else: - super().process_error(data) + super().process_error(data) def get_user_details(self, response): """Return user details from Twitter account""" diff --git a/social_core/backends/vk.py b/social_core/backends/vk.py index ff6ca4240..8eec688cb 100644 --- a/social_core/backends/vk.py +++ b/social_core/backends/vk.py @@ -123,8 +123,7 @@ def user_data(self, access_token, *args, **kwargs): msg = error.get("error_msg", "Unknown error") if error.get("error_code") == 5: raise AuthTokenRevoked(self, msg) - else: - raise AuthException(self, msg) + raise AuthException(self, msg) if data: data = data.get("response")[0] diff --git a/social_core/backends/weixin.py b/social_core/backends/weixin.py index b549b436b..e5873503c 100644 --- a/social_core/backends/weixin.py +++ b/social_core/backends/weixin.py @@ -94,8 +94,7 @@ def auth_complete(self, *args, **kwargs): except HTTPError as err: if err.response.status_code == 400: raise AuthCanceled(self, response=err.response) - else: - raise + raise except KeyError: raise AuthUnknownError(self) if "errcode" in response: @@ -166,8 +165,7 @@ def auth_complete(self, *args, **kwargs): except HTTPError as err: if err.response.status_code == 400: raise AuthCanceled(self) - else: - raise + raise except KeyError: raise AuthUnknownError(self) diff --git a/social_core/pipeline/social_auth.py b/social_core/pipeline/social_auth.py index 1c5940e75..247163371 100644 --- a/social_core/pipeline/social_auth.py +++ b/social_core/pipeline/social_auth.py @@ -20,7 +20,7 @@ def social_user(backend, uid, user=None, *args, **kwargs): if social: if user and social.user != user: raise AuthAlreadyAssociated(backend) - elif not user: + if not user: user = social.user return { "social": social, diff --git a/social_core/utils.py b/social_core/utils.py index 4b6bb2202..b89e0071e 100644 --- a/social_core/utils.py +++ b/social_core/utils.py @@ -256,12 +256,11 @@ def wrapper(*args, **kwargs): except requests.HTTPError as err: if err.response.status_code == 400: raise AuthCanceled(args[0], response=err.response) - elif err.response.status_code == 401: + if err.response.status_code == 401: raise AuthForbidden(args[0]) - elif err.response.status_code == 503: + if err.response.status_code == 503: raise AuthUnreachableProvider(args[0]) - else: - raise + raise return wrapper