aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar MarkKoz <[email protected]>2020-08-12 23:07:30 -0700
committerGravatar MarkKoz <[email protected]>2020-08-14 09:43:39 -0700
commitaaee0f86e99f8dfdc454c52516fbdf7f0030168a (patch)
tree3fae67f0304eb0bceda7f88fdddad99852278f25
parentPrefix names of non-extension modules with _ (diff)
Fix ModLog imports
Bunch of modules still rely on importing the cog directly from the moderation package.
-rw-r--r--bot/cogs/filters/antispam.py2
-rw-r--r--bot/cogs/filters/filtering.py2
-rw-r--r--bot/cogs/filters/token_remover.py2
-rw-r--r--bot/cogs/moderation/defcon.py2
-rw-r--r--bot/cogs/moderation/verification.py2
-rw-r--r--bot/cogs/moderation/watchchannels/_watchchannel.py2
-rw-r--r--bot/cogs/utils/clean.py2
-rw-r--r--tests/bot/cogs/filters/test_token_remover.py2
8 files changed, 8 insertions, 8 deletions
diff --git a/bot/cogs/filters/antispam.py b/bot/cogs/filters/antispam.py
index 0bcca578d..d2dccea06 100644
--- a/bot/cogs/filters/antispam.py
+++ b/bot/cogs/filters/antispam.py
@@ -11,7 +11,7 @@ from discord.ext.commands import Cog
from bot import rules
from bot.bot import Bot
-from bot.cogs.moderation import ModLog
+from bot.cogs.moderation.modlog import ModLog
from bot.constants import (
AntiSpam as AntiSpamConfig, Channels,
Colours, DEBUG_MODE, Event, Filter,
diff --git a/bot/cogs/filters/filtering.py b/bot/cogs/filters/filtering.py
index 93cc1c655..556b466ef 100644
--- a/bot/cogs/filters/filtering.py
+++ b/bot/cogs/filters/filtering.py
@@ -12,7 +12,7 @@ from discord.ext.commands import Cog
from discord.utils import escape_markdown
from bot.bot import Bot
-from bot.cogs.moderation import ModLog
+from bot.cogs.moderation.modlog import ModLog
from bot.constants import (
Channels, Colours,
Filter, Icons, URLs
diff --git a/bot/cogs/filters/token_remover.py b/bot/cogs/filters/token_remover.py
index ef979f222..8eace07b6 100644
--- a/bot/cogs/filters/token_remover.py
+++ b/bot/cogs/filters/token_remover.py
@@ -9,7 +9,7 @@ from discord.ext.commands import Cog
from bot import utils
from bot.bot import Bot
-from bot.cogs.moderation import ModLog
+from bot.cogs.moderation.modlog import ModLog
from bot.constants import Channels, Colours, Event, Icons
log = logging.getLogger(__name__)
diff --git a/bot/cogs/moderation/defcon.py b/bot/cogs/moderation/defcon.py
index 4c0ad5914..e78435a7d 100644
--- a/bot/cogs/moderation/defcon.py
+++ b/bot/cogs/moderation/defcon.py
@@ -9,7 +9,7 @@ from discord import Colour, Embed, Member
from discord.ext.commands import Cog, Context, group
from bot.bot import Bot
-from bot.cogs.moderation import ModLog
+from bot.cogs.moderation.modlog import ModLog
from bot.constants import Channels, Colours, Emojis, Event, Icons, Roles
from bot.decorators import with_role
diff --git a/bot/cogs/moderation/verification.py b/bot/cogs/moderation/verification.py
index ae156cf70..ba95ab5e4 100644
--- a/bot/cogs/moderation/verification.py
+++ b/bot/cogs/moderation/verification.py
@@ -6,7 +6,7 @@ from discord.ext.commands import Cog, Context, command
from bot import constants
from bot.bot import Bot
-from bot.cogs.moderation import ModLog
+from bot.cogs.moderation.modlog import ModLog
from bot.decorators import in_whitelist, without_role
from bot.utils.checks import InWhitelistCheckFailure, without_role_check
diff --git a/bot/cogs/moderation/watchchannels/_watchchannel.py b/bot/cogs/moderation/watchchannels/_watchchannel.py
index 044077350..488ae704d 100644
--- a/bot/cogs/moderation/watchchannels/_watchchannel.py
+++ b/bot/cogs/moderation/watchchannels/_watchchannel.py
@@ -14,7 +14,7 @@ from discord.ext.commands import Cog, Context
from bot.api import ResponseCodeError
from bot.bot import Bot
-from bot.cogs.moderation import ModLog
+from bot.cogs.moderation.modlog import ModLog
from bot.constants import BigBrother as BigBrotherConfig, Guild as GuildConfig, Icons
from bot.pagination import LinePaginator
from bot.utils import CogABCMeta, messages
diff --git a/bot/cogs/utils/clean.py b/bot/cogs/utils/clean.py
index f436e531a..c156ff02e 100644
--- a/bot/cogs/utils/clean.py
+++ b/bot/cogs/utils/clean.py
@@ -8,7 +8,7 @@ from discord.ext import commands
from discord.ext.commands import Cog, Context, group
from bot.bot import Bot
-from bot.cogs.moderation import ModLog
+from bot.cogs.moderation.modlog import ModLog
from bot.constants import (
Channels, CleanMessages, Colours, Event, Icons, MODERATION_ROLES, NEGATIVE_REPLIES
)
diff --git a/tests/bot/cogs/filters/test_token_remover.py b/tests/bot/cogs/filters/test_token_remover.py
index 5c527ed94..55b284ef9 100644
--- a/tests/bot/cogs/filters/test_token_remover.py
+++ b/tests/bot/cogs/filters/test_token_remover.py
@@ -8,7 +8,7 @@ from discord import Colour, NotFound
from bot import constants
from bot.cogs.filters import token_remover
from bot.cogs.filters.token_remover import Token, TokenRemover
-from bot.cogs.moderation import ModLog
+from bot.cogs.moderation.modlog import ModLog
from tests.helpers import MockBot, MockMessage, autospec