diff options
author | 2023-08-11 16:09:09 +0100 | |
---|---|---|
committer | 2023-08-11 16:09:09 +0100 | |
commit | 7a919c013f6a254a28422befddb0f73e8c1b7276 (patch) | |
tree | a1d092ed104bbe167299abd7b8756d4d3e2e83de | |
parent | Use ruff's isort implementation (diff) |
Update import style for ruff isort rule
ruff's isort rule doesn't allow multiple imports on the same line if wrapping. This is arguably easier to read too.
-rw-r--r-- | bot/exts/filtering/_ui/filter.py | 12 | ||||
-rw-r--r-- | bot/exts/filtering/_ui/filter_list.py | 9 | ||||
-rw-r--r-- | bot/exts/filtering/_ui/search.py | 9 | ||||
-rw-r--r-- | bot/exts/filtering/filtering.py | 11 | ||||
-rw-r--r-- | bot/exts/moderation/stream.py | 8 | ||||
-rw-r--r-- | bot/exts/utils/reminders.py | 9 | ||||
-rw-r--r-- | bot/utils/checks.py | 12 | ||||
-rw-r--r-- | tests/bot/exts/filtering/test_settings_entries.py | 4 | ||||
-rw-r--r-- | tests/bot/exts/moderation/test_incidents.py | 12 | ||||
-rw-r--r-- | tests/bot/exts/moderation/test_silence.py | 9 |
10 files changed, 79 insertions, 16 deletions
diff --git a/bot/exts/filtering/_ui/filter.py b/bot/exts/filtering/_ui/filter.py index 6927a5d41..d15a3cacb 100644 --- a/bot/exts/filtering/_ui/filter.py +++ b/bot/exts/filtering/_ui/filter.py @@ -13,8 +13,16 @@ from pydis_core.site_api import ResponseCodeError from bot.exts.filtering._filter_lists.filter_list import FilterList, ListType from bot.exts.filtering._filters.filter import Filter from bot.exts.filtering._ui.ui import ( - COMPONENT_TIMEOUT, CustomCallbackSelect, EditBaseView, MAX_EMBED_DESCRIPTION, MISSING, SETTINGS_DELIMITER, - SINGLE_SETTING_PATTERN, format_response_error, parse_value, populate_embed_from_dict + COMPONENT_TIMEOUT, + CustomCallbackSelect, + EditBaseView, + MAX_EMBED_DESCRIPTION, + MISSING, + SETTINGS_DELIMITER, + SINGLE_SETTING_PATTERN, + format_response_error, + parse_value, + populate_embed_from_dict, ) from bot.exts.filtering._utils import repr_equals, to_serializable from bot.log import get_logger diff --git a/bot/exts/filtering/_ui/filter_list.py b/bot/exts/filtering/_ui/filter_list.py index 2858817e3..a06e8a71e 100644 --- a/bot/exts/filtering/_ui/filter_list.py +++ b/bot/exts/filtering/_ui/filter_list.py @@ -10,8 +10,13 @@ from pydis_core.site_api import ResponseCodeError from bot.exts.filtering._filter_lists import FilterList, ListType from bot.exts.filtering._ui.ui import ( - CustomCallbackSelect, EditBaseView, MISSING, SETTINGS_DELIMITER, format_response_error, parse_value, - populate_embed_from_dict + CustomCallbackSelect, + EditBaseView, + MISSING, + SETTINGS_DELIMITER, + format_response_error, + parse_value, + populate_embed_from_dict, ) from bot.exts.filtering._utils import repr_equals, to_serializable diff --git a/bot/exts/filtering/_ui/search.py b/bot/exts/filtering/_ui/search.py index ccb47cdd2..d26fd9929 100644 --- a/bot/exts/filtering/_ui/search.py +++ b/bot/exts/filtering/_ui/search.py @@ -12,8 +12,13 @@ from bot.exts.filtering._filters.filter import Filter from bot.exts.filtering._settings_types.settings_entry import SettingsEntry from bot.exts.filtering._ui.filter import filter_overrides_for_ui from bot.exts.filtering._ui.ui import ( - COMPONENT_TIMEOUT, CustomCallbackSelect, EditBaseView, MISSING, SETTINGS_DELIMITER, parse_value, - populate_embed_from_dict + COMPONENT_TIMEOUT, + CustomCallbackSelect, + EditBaseView, + MISSING, + SETTINGS_DELIMITER, + parse_value, + populate_embed_from_dict, ) diff --git a/bot/exts/filtering/filtering.py b/bot/exts/filtering/filtering.py index bedd9958f..173b220f8 100644 --- a/bot/exts/filtering/filtering.py +++ b/bot/exts/filtering/filtering.py @@ -33,12 +33,19 @@ from bot.exts.filtering._filters.filter import Filter, UniqueFilter from bot.exts.filtering._settings import ActionSettings from bot.exts.filtering._settings_types.actions.infraction_and_notification import Infraction from bot.exts.filtering._ui.filter import ( - build_filter_repr_dict, description_and_settings_converter, filter_overrides_for_ui, populate_embed_from_dict + build_filter_repr_dict, + description_and_settings_converter, + filter_overrides_for_ui, + populate_embed_from_dict, ) from bot.exts.filtering._ui.filter_list import FilterListAddView, FilterListEditView, settings_converter from bot.exts.filtering._ui.search import SearchEditView, search_criteria_converter from bot.exts.filtering._ui.ui import ( - AlertView, ArgumentCompletionView, DeleteConfirmationView, build_mod_alert, format_response_error + AlertView, + ArgumentCompletionView, + DeleteConfirmationView, + build_mod_alert, + format_response_error, ) from bot.exts.filtering._utils import past_tense, repr_equals, starting_value, to_serializable from bot.exts.moderation.infraction.infractions import COMP_BAN_DURATION, COMP_BAN_REASON diff --git a/bot/exts/moderation/stream.py b/bot/exts/moderation/stream.py index b69f280c9..6cc5c4c51 100644 --- a/bot/exts/moderation/stream.py +++ b/bot/exts/moderation/stream.py @@ -10,7 +10,13 @@ from pydis_core.utils import scheduling from bot.bot import Bot from bot.constants import ( - Colours, Emojis, Guild, MODERATION_ROLES, Roles, STAFF_PARTNERS_COMMUNITY_ROLES, VideoPermission + Colours, + Emojis, + Guild, + MODERATION_ROLES, + Roles, + STAFF_PARTNERS_COMMUNITY_ROLES, + VideoPermission, ) from bot.converters import Expiry from bot.log import get_logger diff --git a/bot/exts/utils/reminders.py b/bot/exts/utils/reminders.py index b6dae0b51..8b0cbed77 100644 --- a/bot/exts/utils/reminders.py +++ b/bot/exts/utils/reminders.py @@ -13,7 +13,14 @@ from pydis_core.utils.scheduling import Scheduler from bot.bot import Bot from bot.constants import ( - Channels, Guild, Icons, MODERATION_ROLES, NEGATIVE_REPLIES, POSITIVE_REPLIES, Roles, STAFF_PARTNERS_COMMUNITY_ROLES + Channels, + Guild, + Icons, + MODERATION_ROLES, + NEGATIVE_REPLIES, + POSITIVE_REPLIES, + Roles, + STAFF_PARTNERS_COMMUNITY_ROLES, ) from bot.converters import Duration, UnambiguousUser from bot.errors import LockedResourceError diff --git a/bot/utils/checks.py b/bot/utils/checks.py index d4f9c3a27..e46c8209b 100644 --- a/bot/utils/checks.py +++ b/bot/utils/checks.py @@ -1,8 +1,16 @@ from collections.abc import Callable, Container, Iterable from discord.ext.commands import ( - BucketType, CheckFailure, Cog, Command, CommandOnCooldown, Context, Cooldown, CooldownMapping, NoPrivateMessage, - has_any_role + BucketType, + CheckFailure, + Cog, + Command, + CommandOnCooldown, + Context, + Cooldown, + CooldownMapping, + NoPrivateMessage, + has_any_role, ) from bot import constants diff --git a/tests/bot/exts/filtering/test_settings_entries.py b/tests/bot/exts/filtering/test_settings_entries.py index 988435022..f12b2caa5 100644 --- a/tests/bot/exts/filtering/test_settings_entries.py +++ b/tests/bot/exts/filtering/test_settings_entries.py @@ -2,7 +2,9 @@ import unittest from bot.exts.filtering._filter_context import Event, FilterContext from bot.exts.filtering._settings_types.actions.infraction_and_notification import ( - Infraction, InfractionAndNotification, InfractionDuration + Infraction, + InfractionAndNotification, + InfractionDuration, ) from bot.exts.filtering._settings_types.validations.bypass_roles import RoleBypass from bot.exts.filtering._settings_types.validations.channel_scope import ChannelScope diff --git a/tests/bot/exts/moderation/test_incidents.py b/tests/bot/exts/moderation/test_incidents.py index 61f64da44..d8e3ddd8c 100644 --- a/tests/bot/exts/moderation/test_incidents.py +++ b/tests/bot/exts/moderation/test_incidents.py @@ -16,8 +16,16 @@ from bot.utils.messages import format_user from bot.utils.time import TimestampFormats, discord_timestamp from tests.base import RedisTestCase from tests.helpers import ( - MockAsyncWebhook, MockAttachment, MockBot, MockMember, MockMessage, MockReaction, MockRole, MockTextChannel, - MockUser, no_create_task + MockAsyncWebhook, + MockAttachment, + MockBot, + MockMember, + MockMessage, + MockReaction, + MockRole, + MockTextChannel, + MockUser, + no_create_task, ) CURRENT_TIME = datetime.datetime(2022, 1, 1, tzinfo=datetime.UTC) diff --git a/tests/bot/exts/moderation/test_silence.py b/tests/bot/exts/moderation/test_silence.py index ec0b3bf43..a7f239d7f 100644 --- a/tests/bot/exts/moderation/test_silence.py +++ b/tests/bot/exts/moderation/test_silence.py @@ -10,7 +10,14 @@ from bot.constants import Channels, Guild, MODERATION_ROLES, Roles from bot.exts.moderation import silence from tests.base import RedisTestCase from tests.helpers import ( - MockBot, MockContext, MockGuild, MockMember, MockRole, MockTextChannel, MockVoiceChannel, autospec + MockBot, + MockContext, + MockGuild, + MockMember, + MockRole, + MockTextChannel, + MockVoiceChannel, + autospec, ) |