diff options
| author |  MarkKoz <[email protected]> | 2019-09-30 18:47:42 -0700 |
|---|---|---|
| committer | MarkKoz <[email protected]> | 2019-10-01 18:25:33 -0700 |
| commit | 394f687ed9aca0a00147abe4bf14fdf65f0d5d70 (patch) | |
| tree | cf3de1b071db21bbe9bbaab43bfd43f994289fb4 | |
| parent | Move Superstarify to moderation sub-package (diff) | |
Fix circular imports
| -rw-r--r-- | bot/cogs/moderation/infractions.py | 8 | ||||
| -rw-r--r-- | bot/cogs/moderation/management.py | 5 | ||||
| -rw-r--r-- | bot/cogs/moderation/superstarify.py | 5 |
3 files changed, 10 insertions, 8 deletions
diff --git a/bot/cogs/moderation/infractions.py b/bot/cogs/moderation/infractions.py index d36f147f7..cf7163c41 100644 --- a/bot/cogs/moderation/infractions.py +++ b/bot/cogs/moderation/infractions.py @@ -9,16 +9,16 @@ from discord import ( from discord.ext.commands import BadUnionArgument, Bot, Cog, Context, command from bot import constants -from bot.cogs.moderation import ModLog -from bot.cogs.moderation.utils import ( - Infraction, MemberObject, already_has_active_infraction, post_infraction, proxy_user -) from bot.constants import Colours, Event, Icons from bot.converters import Duration from bot.decorators import respect_role_hierarchy from bot.utils.checks import with_role_check from bot.utils.scheduling import Scheduler from bot.utils.time import format_infraction, wait_until +from .modlog import ModLog +from .utils import ( + Infraction, MemberObject, already_has_active_infraction, post_infraction, proxy_user +) log = logging.getLogger(__name__) diff --git a/bot/cogs/moderation/management.py b/bot/cogs/moderation/management.py index 6bacab8ca..7c5c5583a 100644 --- a/bot/cogs/moderation/management.py +++ b/bot/cogs/moderation/management.py @@ -8,12 +8,13 @@ from discord.ext import commands from discord.ext.commands import Context from bot import constants -from bot.cogs.moderation import Infractions, ModLog -from bot.cogs.moderation.utils import Infraction, proxy_user from bot.converters import Duration, InfractionSearchQuery from bot.pagination import LinePaginator from bot.utils import time from bot.utils.checks import with_role_check +from .infractions import Infractions +from .modlog import ModLog +from .utils import Infraction, proxy_user log = logging.getLogger(__name__) diff --git a/bot/cogs/moderation/superstarify.py b/bot/cogs/moderation/superstarify.py index 194f22dd9..cc087d361 100644 --- a/bot/cogs/moderation/superstarify.py +++ b/bot/cogs/moderation/superstarify.py @@ -7,12 +7,13 @@ from discord import Colour, Embed, Member from discord.errors import Forbidden from discord.ext.commands import Bot, Cog, Context, command -from bot.cogs.moderation import Infractions, ModLog -from bot.cogs.moderation.utils import post_infraction from bot.constants import Icons, MODERATION_ROLES, POSITIVE_REPLIES from bot.converters import Duration from bot.decorators import with_role from bot.utils.time import format_infraction +from .infractions import Infractions +from .modlog import ModLog +from .utils import post_infraction log = logging.getLogger(__name__) NICKNAME_POLICY_URL = "https://pythondiscord.com/pages/rules/#wiki-toc-nickname-policy" |