Deseasonify: move decorators module under utils

17 files changed, 16 insertions, 16 deletions

diff --git a/bot/__main__.py b/bot/__main__.py
index 780c8c4d..3662a63b 100644
--- a/bot/__main__.py
+++ b/bot/__main__.py
@@ -2,8 +2,8 @@ import logging
 
 from bot.bot import bot
 from bot.constants import Client, STAFF_ROLES, WHITELISTED_CHANNELS
-from bot.decorators import in_channel_check
 from bot.seasons import get_extensions
+from bot.utils.decorators import in_channel_check
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/bot.py b/bot/bot.py
index b47e1289..47d63de9 100644
--- a/bot/bot.py
+++ b/bot/bot.py
@@ -11,7 +11,7 @@ from discord import DiscordException, Embed
 from discord.ext import commands
 
 from bot.constants import Channels, Client
-from bot.decorators import mock_in_debug
+from bot.utils.decorators import mock_in_debug
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/branding.py b/bot/branding.py
index 6f5e7a5c..2eb563ea 100644
--- a/bot/branding.py
+++ b/bot/branding.py
@@ -12,8 +12,8 @@ from discord.ext import commands
 
 from bot.bot import SeasonalBot
 from bot.constants import Branding, Colours, Emojis, MODERATION_ROLES, Tokens
-from bot.decorators import with_role
 from bot.seasons import SeasonBase, get_current_season, get_season
+from bot.utils.decorators import with_role
 from bot.utils.exceptions import BrandingError
 
 log = logging.getLogger(__name__)
diff --git a/bot/seasons/christmas/adventofcode.py b/bot/seasons/christmas/adventofcode.py
index e6100056..f7590e04 100644
--- a/bot/seasons/christmas/adventofcode.py
+++ b/bot/seasons/christmas/adventofcode.py
@@ -14,8 +14,8 @@ from discord.ext import commands
 from pytz import timezone
 
 from bot.constants import AdventOfCode as AocConfig, Channels, Colours, Emojis, Month, Tokens, WHITELISTED_CHANNELS
-from bot.decorators import in_month, override_in_channel
 from bot.utils import unlocked_role
+from bot.utils.decorators import in_month, override_in_channel
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/seasons/christmas/hanukkah_embed.py b/bot/seasons/christmas/hanukkah_embed.py
index e73a33ad..62efd04e 100644
--- a/bot/seasons/christmas/hanukkah_embed.py
+++ b/bot/seasons/christmas/hanukkah_embed.py
@@ -6,7 +6,7 @@ from discord import Embed
 from discord.ext import commands
 
 from bot.constants import Colours, Month
-from bot.decorators import in_month
+from bot.utils.decorators import in_month
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/seasons/easter/egg_facts.py b/bot/seasons/easter/egg_facts.py
index d20df3de..99a80b28 100644
--- a/bot/seasons/easter/egg_facts.py
+++ b/bot/seasons/easter/egg_facts.py
@@ -7,7 +7,7 @@ import discord
 from discord.ext import commands
 
 from bot.constants import Channels, Colours, Month
-from bot.decorators import seasonal_task
+from bot.utils.decorators import seasonal_task
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/seasons/evergreen/error_handler.py b/bot/seasons/evergreen/error_handler.py
index d2accbd1..d268dab1 100644
--- a/bot/seasons/evergreen/error_handler.py
+++ b/bot/seasons/evergreen/error_handler.py
@@ -7,7 +7,7 @@ from discord import Embed, Message
 from discord.ext import commands
 
 from bot.constants import Colours, ERROR_REPLIES, NEGATIVE_REPLIES
-from bot.decorators import InChannelCheckFailure, InMonthCheckFailure
+from bot.utils.decorators import InChannelCheckFailure, InMonthCheckFailure
 from bot.utils.exceptions import BrandingError
 
 log = logging.getLogger(__name__)
diff --git a/bot/seasons/evergreen/game.py b/bot/seasons/evergreen/game.py
index ace77e9d..d43b1ad6 100644
--- a/bot/seasons/evergreen/game.py
+++ b/bot/seasons/evergreen/game.py
@@ -12,7 +12,7 @@ from discord.ext.commands import Cog, Context, group
 
 from bot.bot import SeasonalBot
 from bot.constants import STAFF_ROLES, Tokens
-from bot.decorators import with_role
+from bot.utils.decorators import with_role
 from bot.utils.pagination import ImagePaginator, LinePaginator
 
 # Base URL of IGDB API
diff --git a/bot/seasons/evergreen/issues.py b/bot/seasons/evergreen/issues.py
index fba5b174..fb18b62a 100644
--- a/bot/seasons/evergreen/issues.py
+++ b/bot/seasons/evergreen/issues.py
@@ -4,7 +4,7 @@ import discord
 from discord.ext import commands
 
 from bot.constants import Colours, Emojis, WHITELISTED_CHANNELS
-from bot.decorators import override_in_channel
+from bot.utils.decorators import override_in_channel
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/seasons/evergreen/snakes/snakes_cog.py b/bot/seasons/evergreen/snakes/snakes_cog.py
index 09f5e250..e5a03a20 100644
--- a/bot/seasons/evergreen/snakes/snakes_cog.py
+++ b/bot/seasons/evergreen/snakes/snakes_cog.py
@@ -18,9 +18,9 @@ from discord import Colour, Embed, File, Member, Message, Reaction
 from discord.ext.commands import BadArgument, Bot, Cog, CommandError, Context, bot_has_permissions, group
 
 from bot.constants import ERROR_REPLIES, Tokens
-from bot.decorators import locked
 from bot.seasons.evergreen.snakes import utils
 from bot.seasons.evergreen.snakes.converter import Snake
+from bot.utils.decorators import locked
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/seasons/halloween/candy_collection.py b/bot/seasons/halloween/candy_collection.py
index 967a62aa..3f2b895e 100644
--- a/bot/seasons/halloween/candy_collection.py
+++ b/bot/seasons/halloween/candy_collection.py
@@ -9,7 +9,7 @@ import discord
 from discord.ext import commands
 
 from bot.constants import Channels, Month
-from bot.decorators import in_month
+from bot.utils.decorators import in_month
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/seasons/halloween/hacktober-issue-finder.py b/bot/seasons/halloween/hacktober-issue-finder.py
index e90796f1..f15a665a 100644
--- a/bot/seasons/halloween/hacktober-issue-finder.py
+++ b/bot/seasons/halloween/hacktober-issue-finder.py
@@ -8,7 +8,7 @@ import discord
 from discord.ext import commands
 
 from bot.constants import Month
-from bot.decorators import in_month
+from bot.utils.decorators import in_month
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/seasons/halloween/hacktoberstats.py b/bot/seasons/halloween/hacktoberstats.py
index 3b1444ab..5dfa2f51 100644
--- a/bot/seasons/halloween/hacktoberstats.py
+++ b/bot/seasons/halloween/hacktoberstats.py
@@ -11,7 +11,7 @@ import discord
 from discord.ext import commands
 
 from bot.constants import Channels, Month, WHITELISTED_CHANNELS
-from bot.decorators import in_month, override_in_channel
+from bot.utils.decorators import in_month, override_in_channel
 from bot.utils.persist import make_persistent
 
 log = logging.getLogger(__name__)
diff --git a/bot/seasons/halloween/spookyreact.py b/bot/seasons/halloween/spookyreact.py
index 37f42a86..16f18019 100644
--- a/bot/seasons/halloween/spookyreact.py
+++ b/bot/seasons/halloween/spookyreact.py
@@ -5,7 +5,7 @@ import discord
 from discord.ext.commands import Bot, Cog
 
 from bot.constants import Month
-from bot.decorators import in_month
+from bot.utils.decorators import in_month
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/seasons/pride/pride_facts.py b/bot/seasons/pride/pride_facts.py
index 1a02eaaa..2db8f5c2 100644
--- a/bot/seasons/pride/pride_facts.py
+++ b/bot/seasons/pride/pride_facts.py
@@ -10,7 +10,7 @@ import discord
 from discord.ext import commands
 
 from bot.constants import Channels, Colours, Month
-from bot.decorators import seasonal_task
+from bot.utils.decorators import seasonal_task
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/seasons/valentines/be_my_valentine.py b/bot/seasons/valentines/be_my_valentine.py
index 67d8796a..1e883d21 100644
--- a/bot/seasons/valentines/be_my_valentine.py
+++ b/bot/seasons/valentines/be_my_valentine.py
@@ -9,7 +9,7 @@ from discord.ext import commands
 from discord.ext.commands.cooldowns import BucketType
 
 from bot.constants import Channels, Client, Colours, Lovefest, Month
-from bot.decorators import in_month
+from bot.utils.decorators import in_month
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/decorators.py b/bot/utils/decorators.py
index f85996b5..f85996b5 100644
--- a/bot/decorators.py
+++ b/bot/utils/decorators.py