Merge remote-tracking branch 'origin/main' into discord-2.0

4 files changed, 6 insertions, 26 deletions

diff --git a/tests/bot/exts/events/test_code_jams.py b/tests/bot/exts/events/test_code_jams.py
index b9ee1e363..0856546af 100644
--- a/tests/bot/exts/events/test_code_jams.py
+++ b/tests/bot/exts/events/test_code_jams.py
@@ -8,8 +8,8 @@ from bot.constants import Roles
 from bot.exts.events import code_jams
 from bot.exts.events.code_jams import _channels, _cog
 from tests.helpers import (
-    MockAttachment, MockBot, MockCategoryChannel, MockContext,
-    MockGuild, MockMember, MockRole, MockTextChannel, autospec
+    MockAttachment, MockBot, MockCategoryChannel, MockContext, MockGuild, MockMember, MockRole, MockTextChannel,
+    autospec
 )
 
 TEST_CSV = b"""\
diff --git a/tests/bot/exts/moderation/test_incidents.py b/tests/bot/exts/moderation/test_incidents.py
index 583cb8bb3..ccc842050 100644
--- a/tests/bot/exts/moderation/test_incidents.py
+++ b/tests/bot/exts/moderation/test_incidents.py
@@ -11,15 +11,8 @@ import discord
 from bot.constants import Colours
 from bot.exts.moderation import incidents
 from tests.helpers import (
-    MockAsyncWebhook,
-    MockAttachment,
-    MockBot,
-    MockMember,
-    MockMessage,
-    MockReaction,
-    MockRole,
-    MockTextChannel,
-    MockUser,
+    MockAsyncWebhook, MockAttachment, MockBot, MockMember, MockMessage, MockReaction, MockRole, MockTextChannel,
+    MockUser
 )
 
 
diff --git a/tests/bot/exts/moderation/test_silence.py b/tests/bot/exts/moderation/test_silence.py
index 78a12b6d2..92ce3418a 100644
--- a/tests/bot/exts/moderation/test_silence.py
+++ b/tests/bot/exts/moderation/test_silence.py
@@ -12,14 +12,7 @@ from discord import PermissionOverwrite
 from bot.constants import Channels, Guild, MODERATION_ROLES, Roles
 from bot.exts.moderation import silence
 from tests.helpers import (
-    MockBot,
-    MockContext,
-    MockGuild,
-    MockMember,
-    MockRole,
-    MockTextChannel,
-    MockVoiceChannel,
-    autospec
+    MockBot, MockContext, MockGuild, MockMember, MockRole, MockTextChannel, MockVoiceChannel, autospec
 )
 
 redis_session = None
diff --git a/tests/bot/test_converters.py b/tests/bot/test_converters.py
index 6e3a6b898..ef6c8e19e 100644
--- a/tests/bot/test_converters.py
+++ b/tests/bot/test_converters.py
@@ -6,13 +6,7 @@ from unittest.mock import MagicMock, patch
 from dateutil.relativedelta import relativedelta
 from discord.ext.commands import BadArgument
 
-from bot.converters import (
-    Duration,
-    HushDurationConverter,
-    ISODateTime,
-    PackageName,
-    TagNameConverter,
-)
+from bot.converters import Duration, HushDurationConverter, ISODateTime, PackageName, TagNameConverter
 
 
 class ConverterTests(unittest.IsolatedAsyncioTestCase):