aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--bot/converters.py1
-rw-r--r--bot/exts/filters/antispam.py5
-rw-r--r--bot/exts/filters/filtering.py5
-rw-r--r--bot/exts/info/doc/__init__.py1
-rw-r--r--bot/exts/info/doc/_batch_parser.py1
-rw-r--r--bot/exts/info/doc/_cog.py1
-rw-r--r--bot/exts/info/doc/_parsing.py2
-rw-r--r--bot/exts/info/doc/_redis_cache.py1
-rw-r--r--bot/exts/moderation/stream.py3
-rw-r--r--bot/exts/moderation/voice_gate.py1
-rw-r--r--bot/exts/utils/clean.py4
-rw-r--r--bot/exts/utils/reminders.py5
-rw-r--r--bot/rules/discord_emojis.py1
-rw-r--r--bot/rules/links.py1
-rw-r--r--bot/utils/checks.py12
-rw-r--r--tests/__init__.py1
-rw-r--r--tests/bot/exts/backend/sync/test_base.py1
-rw-r--r--tests/bot/exts/events/test_code_jams.py4
-rw-r--r--tests/bot/exts/moderation/test_incidents.py11
-rw-r--r--tests/bot/exts/moderation/test_silence.py9
-rw-r--r--tests/bot/test_converters.py8
-rw-r--r--tests/test_base.py1
22 files changed, 20 insertions, 59 deletions
diff --git a/bot/converters.py b/bot/converters.py
index c96e2c984..7f6aa9c52 100644
--- a/bot/converters.py
+++ b/bot/converters.py
@@ -22,6 +22,7 @@ from bot.exts.info.doc import _inventory_parser
from bot.utils.extensions import EXTENSIONS, unqualify
from bot.utils.regex import INVITE_RE
from bot.utils.time import parse_duration_string
+
if t.TYPE_CHECKING:
from bot.exts.info.source import SourceType
diff --git a/bot/exts/filters/antispam.py b/bot/exts/filters/antispam.py
index 8bae159d2..94aec6684 100644
--- a/bot/exts/filters/antispam.py
+++ b/bot/exts/filters/antispam.py
@@ -14,9 +14,7 @@ from discord.ext.commands import Cog
from bot import rules
from bot.bot import Bot
from bot.constants import (
- AntiSpam as AntiSpamConfig, Channels,
- Colours, DEBUG_MODE, Event, Filter,
- Guild as GuildConfig, Icons,
+ AntiSpam as AntiSpamConfig, Channels, Colours, DEBUG_MODE, Event, Filter, Guild as GuildConfig, Icons
)
from bot.converters import Duration
from bot.exts.events.code_jams._channels import CATEGORY_NAME as JAM_CATEGORY_NAME
@@ -25,7 +23,6 @@ from bot.utils import lock, scheduling
from bot.utils.message_cache import MessageCache
from bot.utils.messages import format_user, send_attachments
-
log = logging.getLogger(__name__)
RULE_FUNCTION_MAPPING = {
diff --git a/bot/exts/filters/filtering.py b/bot/exts/filters/filtering.py
index 64f3b82af..916e3efff 100644
--- a/bot/exts/filters/filtering.py
+++ b/bot/exts/filters/filtering.py
@@ -15,10 +15,7 @@ from discord.utils import escape_markdown
from bot.api import ResponseCodeError
from bot.bot import Bot
-from bot.constants import (
- Channels, Colours, Filter,
- Guild, Icons, URLs
-)
+from bot.constants import Channels, Colours, Filter, Guild, Icons, URLs
from bot.exts.events.code_jams._channels import CATEGORY_NAME as JAM_CATEGORY_NAME
from bot.exts.moderation.modlog import ModLog
from bot.utils import scheduling
diff --git a/bot/exts/info/doc/__init__.py b/bot/exts/info/doc/__init__.py
index 38a8975c0..facdf4d0b 100644
--- a/bot/exts/info/doc/__init__.py
+++ b/bot/exts/info/doc/__init__.py
@@ -1,4 +1,5 @@
from bot.bot import Bot
+
from ._redis_cache import DocRedisCache
MAX_SIGNATURE_AMOUNT = 3
diff --git a/bot/exts/info/doc/_batch_parser.py b/bot/exts/info/doc/_batch_parser.py
index 51ee29b68..c8e542ce7 100644
--- a/bot/exts/info/doc/_batch_parser.py
+++ b/bot/exts/info/doc/_batch_parser.py
@@ -14,6 +14,7 @@ from bs4 import BeautifulSoup
import bot
from bot.constants import Channels
from bot.utils import scheduling
+
from . import _cog, doc_cache
from ._parsing import get_symbol_markdown
diff --git a/bot/exts/info/doc/_cog.py b/bot/exts/info/doc/_cog.py
index ca6af946b..5a8aa8841 100644
--- a/bot/exts/info/doc/_cog.py
+++ b/bot/exts/info/doc/_cog.py
@@ -22,6 +22,7 @@ from bot.utils import scheduling
from bot.utils.lock import SharedEvent, lock
from bot.utils.messages import send_denial, wait_for_deletion
from bot.utils.scheduling import Scheduler
+
from . import NAMESPACE, PRIORITY_PACKAGES, _batch_parser, doc_cache
from ._inventory_parser import InvalidHeaderError, InventoryDict, fetch_inventory
diff --git a/bot/exts/info/doc/_parsing.py b/bot/exts/info/doc/_parsing.py
index 1a0d42c47..a1bf33de9 100644
--- a/bot/exts/info/doc/_parsing.py
+++ b/bot/exts/info/doc/_parsing.py
@@ -11,9 +11,11 @@ from bs4 import BeautifulSoup
from bs4.element import NavigableString, Tag
from bot.utils.helpers import find_nth_occurrence
+
from . import MAX_SIGNATURE_AMOUNT
from ._html import get_dd_description, get_general_description, get_signatures
from ._markdown import DocMarkdownConverter
+
if TYPE_CHECKING:
from ._cog import DocItem
diff --git a/bot/exts/info/doc/_redis_cache.py b/bot/exts/info/doc/_redis_cache.py
index ad764816f..79648893a 100644
--- a/bot/exts/info/doc/_redis_cache.py
+++ b/bot/exts/info/doc/_redis_cache.py
@@ -4,6 +4,7 @@ import datetime
from typing import Optional, TYPE_CHECKING
from async_rediscache.types.base import RedisObject, namespace_lock
+
if TYPE_CHECKING:
from ._cog import DocItem
diff --git a/bot/exts/moderation/stream.py b/bot/exts/moderation/stream.py
index a179a9acc..735cd21da 100644
--- a/bot/exts/moderation/stream.py
+++ b/bot/exts/moderation/stream.py
@@ -10,8 +10,7 @@ from discord.ext import commands
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.pagination import LinePaginator
diff --git a/bot/exts/moderation/voice_gate.py b/bot/exts/moderation/voice_gate.py
index 8494a1e2e..2e8e8513a 100644
--- a/bot/exts/moderation/voice_gate.py
+++ b/bot/exts/moderation/voice_gate.py
@@ -8,7 +8,6 @@ from async_rediscache import RedisCache
from discord import Colour, Member, VoiceState
from discord.ext.commands import Cog, Context, command
-
from bot.api import ResponseCodeError
from bot.bot import Bot
from bot.constants import Channels, Event, MODERATION_ROLES, Roles, VoiceGate as GateConf
diff --git a/bot/exts/utils/clean.py b/bot/exts/utils/clean.py
index cb662e852..764ebca15 100644
--- a/bot/exts/utils/clean.py
+++ b/bot/exts/utils/clean.py
@@ -8,9 +8,7 @@ from discord.ext import commands
from discord.ext.commands import Cog, Context, group, has_any_role
from bot.bot import Bot
-from bot.constants import (
- Channels, CleanMessages, Colours, Event, Icons, MODERATION_ROLES, NEGATIVE_REPLIES
-)
+from bot.constants import Channels, CleanMessages, Colours, Event, Icons, MODERATION_ROLES, NEGATIVE_REPLIES
from bot.exts.moderation.modlog import ModLog
log = logging.getLogger(__name__)
diff --git a/bot/exts/utils/reminders.py b/bot/exts/utils/reminders.py
index 95f3661af..bf4fdf96b 100644
--- a/bot/exts/utils/reminders.py
+++ b/bot/exts/utils/reminders.py
@@ -10,10 +10,7 @@ from dateutil.parser import isoparse
from discord.ext.commands import Cog, Context, Greedy, group
from bot.bot import Bot
-from bot.constants import (
- Guild, Icons, MODERATION_ROLES, POSITIVE_REPLIES,
- Roles, STAFF_PARTNERS_COMMUNITY_ROLES
-)
+from bot.constants import Guild, Icons, MODERATION_ROLES, POSITIVE_REPLIES, Roles, STAFF_PARTNERS_COMMUNITY_ROLES
from bot.converters import Duration, UnambiguousUser
from bot.pagination import LinePaginator
from bot.utils import scheduling
diff --git a/bot/rules/discord_emojis.py b/bot/rules/discord_emojis.py
index 41faf7ee8..d979ac5e7 100644
--- a/bot/rules/discord_emojis.py
+++ b/bot/rules/discord_emojis.py
@@ -4,7 +4,6 @@ from typing import Dict, Iterable, List, Optional, Tuple
from discord import Member, Message
from emoji import demojize
-
DISCORD_EMOJI_RE = re.compile(r"<:\w+:\d+>|:\w+:")
CODE_BLOCK_RE = re.compile(r"```.*?```", flags=re.DOTALL)
diff --git a/bot/rules/links.py b/bot/rules/links.py
index ec75a19c5..c46b783c5 100644
--- a/bot/rules/links.py
+++ b/bot/rules/links.py
@@ -3,7 +3,6 @@ from typing import Dict, Iterable, List, Optional, Tuple
from discord import Member, Message
-
LINK_RE = re.compile(r"(https?://[^\s]+)")
diff --git a/bot/utils/checks.py b/bot/utils/checks.py
index 3d0c8a50c..ff311010e 100644
--- a/bot/utils/checks.py
+++ b/bot/utils/checks.py
@@ -3,16 +3,8 @@ import logging
from typing import Callable, Container, Iterable, Optional, Union
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/__init__.py b/tests/__init__.py
index 2228110ad..f5b83a261 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,5 +1,4 @@
import logging
-
log = logging.getLogger()
log.setLevel(logging.CRITICAL)
diff --git a/tests/bot/exts/backend/sync/test_base.py b/tests/bot/exts/backend/sync/test_base.py
index 3ad9db9c3..9dc46005b 100644
--- a/tests/bot/exts/backend/sync/test_base.py
+++ b/tests/bot/exts/backend/sync/test_base.py
@@ -1,7 +1,6 @@
import unittest
from unittest import mock
-
from bot.api import ResponseCodeError
from bot.exts.backend.sync._syncers import Syncer
from tests import helpers
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 cbf7f7bcf..c98edf08a 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 59a5893ef..ef8394be8 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):
diff --git a/tests/test_base.py b/tests/test_base.py
index a7db4bf3e..7dd5dfac4 100644
--- a/tests/test_base.py
+++ b/tests/test_base.py
@@ -2,7 +2,6 @@ import logging
import unittest
import unittest.mock
-
from tests.base import LoggingTestsMixin, _CaptureLogHandler
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-04 00:12:52 +0000