From 7ca09aac1b4f493757e10bfaa35f6127aa185845 Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Sun, 8 Nov 2020 22:01:07 +0000 Subject: [PATCH] Refactor unnecessary `else` / `elif` when `if` block has a `raise` statement --- aiogram/bot/api.py | 4 ++-- aiogram/dispatcher/filters/builtin.py | 2 +- aiogram/dispatcher/filters/filters.py | 2 +- aiogram/utils/callback_data.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aiogram/bot/api.py b/aiogram/bot/api.py index d0639aa2..12d830e0 100644 --- a/aiogram/bot/api.py +++ b/aiogram/bot/api.py @@ -109,9 +109,9 @@ def check_result(method_name: str, content_type: str, status_code: int, body: st return result_json.get('result') if parameters.retry_after: raise exceptions.RetryAfter(parameters.retry_after) - elif parameters.migrate_to_chat_id: + if parameters.migrate_to_chat_id: raise exceptions.MigrateToChat(parameters.migrate_to_chat_id) - elif status_code == HTTPStatus.BAD_REQUEST: + if status_code == HTTPStatus.BAD_REQUEST: exceptions.BadRequest.detect(description) elif status_code == HTTPStatus.NOT_FOUND: exceptions.NotFound.detect(description) diff --git a/aiogram/dispatcher/filters/builtin.py b/aiogram/dispatcher/filters/builtin.py index 2a23e8fc..e70ee8ec 100644 --- a/aiogram/dispatcher/filters/builtin.py +++ b/aiogram/dispatcher/filters/builtin.py @@ -275,7 +275,7 @@ class Text(Filter): ('endswith', endswith) ] if arg[1] is not None]) raise ValueError(f"Arguments '{args}' cannot be used together.") - elif check == 0: + if check == 0: raise ValueError(f"No one mode is specified!") equals, contains, endswith, startswith = map( diff --git a/aiogram/dispatcher/filters/filters.py b/aiogram/dispatcher/filters/filters.py index 09ab2477..c1e78647 100644 --- a/aiogram/dispatcher/filters/filters.py +++ b/aiogram/dispatcher/filters/filters.py @@ -70,7 +70,7 @@ async def check_filters(filters: typing.Iterable[FilterObj], args): f = await execute_filter(filter_, args) if not f: raise FilterNotPassed() - elif isinstance(f, dict): + if isinstance(f, dict): data.update(f) return data diff --git a/aiogram/utils/callback_data.py b/aiogram/utils/callback_data.py index e24ad7b1..381aad3f 100644 --- a/aiogram/utils/callback_data.py +++ b/aiogram/utils/callback_data.py @@ -90,7 +90,7 @@ class CallbackData: prefix, *parts = callback_data.split(self.sep) if prefix != self.prefix: raise ValueError("Passed callback data can't be parsed with that prefix.") - elif len(parts) != len(self._part_names): + if len(parts) != len(self._part_names): raise ValueError('Invalid parts count!') result = {'@': prefix}