diff options
43 files changed, 59 insertions, 59 deletions
diff --git a/bot/__init__.py b/bot/__init__.py index c652897be..290ca682b 100644 --- a/bot/__init__.py +++ b/bot/__init__.py @@ -2,7 +2,7 @@ import asyncio import os from typing import TYPE_CHECKING -from botcore.utils import apply_monkey_patches +from pydis_core.utils import apply_monkey_patches from bot import log diff --git a/bot/__main__.py b/bot/__main__.py index 02af2e9ef..c8843e1a3 100644 --- a/bot/__main__.py +++ b/bot/__main__.py @@ -3,9 +3,9 @@ import asyncio import aiohttp import discord from async_rediscache import RedisSession -from botcore import StartupError -from botcore.site_api import APIClient from discord.ext import commands +from pydis_core import StartupError +from pydis_core.site_api import APIClient from redis import RedisError import bot diff --git a/bot/bot.py b/bot/bot.py index aff07cd32..6164ba9fd 100644 --- a/bot/bot.py +++ b/bot/bot.py @@ -2,8 +2,8 @@ import asyncio from collections import defaultdict import aiohttp -from botcore import BotBase -from botcore.utils import scheduling +from pydis_core import BotBase +from pydis_core.utils import scheduling from sentry_sdk import push_scope from bot import constants, exts @@ -21,7 +21,7 @@ class StartupError(Exception): class Bot(BotBase): - """A subclass of `botcore.BotBase` that implements bot-specific functions.""" + """A subclass of `pydis_core.BotBase` that implements bot-specific functions.""" def __init__(self, *args, **kwargs): diff --git a/bot/converters.py b/bot/converters.py index e97a25bdd..544513c90 100644 --- a/bot/converters.py +++ b/bot/converters.py @@ -8,12 +8,12 @@ from ssl import CertificateError import dateutil.parser import discord from aiohttp import ClientConnectorError -from botcore.site_api import ResponseCodeError -from botcore.utils import unqualify -from botcore.utils.regex import DISCORD_INVITE from dateutil.relativedelta import relativedelta from discord.ext.commands import BadArgument, Bot, Context, Converter, IDConverter, MemberConverter, UserConverter from discord.utils import escape_markdown, snowflake_time +from pydis_core.site_api import ResponseCodeError +from pydis_core.utils import unqualify +from pydis_core.utils.regex import DISCORD_INVITE from bot import exts, instance as bot_instance from bot.constants import URLs diff --git a/bot/decorators.py b/bot/decorators.py index 466770c3a..2ddc7ee96 100644 --- a/bot/decorators.py +++ b/bot/decorators.py @@ -5,10 +5,10 @@ import typing as t from contextlib import suppress import arrow -from botcore.utils import scheduling from discord import Member, NotFound from discord.ext import commands from discord.ext.commands import Cog, Context +from pydis_core.utils import scheduling from bot.constants import Channels, DEBUG_MODE, RedirectOutput from bot.log import get_logger diff --git a/bot/exts/backend/error_handler.py b/bot/exts/backend/error_handler.py index f9ded79f0..cc2b5ef56 100644 --- a/bot/exts/backend/error_handler.py +++ b/bot/exts/backend/error_handler.py @@ -1,9 +1,9 @@ import copy import difflib -from botcore.site_api import ResponseCodeError from discord import Embed from discord.ext.commands import ChannelNotFound, Cog, Context, TextChannelConverter, VoiceChannelConverter, errors +from pydis_core.site_api import ResponseCodeError from sentry_sdk import push_scope from bot.bot import Bot diff --git a/bot/exts/backend/logging.py b/bot/exts/backend/logging.py index b9504c2eb..eba9f3c74 100644 --- a/bot/exts/backend/logging.py +++ b/bot/exts/backend/logging.py @@ -1,6 +1,6 @@ -from botcore.utils import scheduling from discord import Embed from discord.ext.commands import Cog +from pydis_core.utils import scheduling from bot.bot import Bot from bot.constants import Channels, DEBUG_MODE diff --git a/bot/exts/backend/sync/_cog.py b/bot/exts/backend/sync/_cog.py index 433ff5024..8c7dbb54e 100644 --- a/bot/exts/backend/sync/_cog.py +++ b/bot/exts/backend/sync/_cog.py @@ -1,10 +1,10 @@ import asyncio from typing import Any, Dict -from botcore.site_api import ResponseCodeError from discord import Member, Role, User from discord.ext import commands from discord.ext.commands import Cog, Context +from pydis_core.site_api import ResponseCodeError from bot import constants from bot.bot import Bot diff --git a/bot/exts/backend/sync/_syncers.py b/bot/exts/backend/sync/_syncers.py index 8976245e3..f68674f8d 100644 --- a/bot/exts/backend/sync/_syncers.py +++ b/bot/exts/backend/sync/_syncers.py @@ -3,10 +3,10 @@ import typing as t from collections import namedtuple import discord.errors -from botcore.site_api import ResponseCodeError from discord import Guild from discord.ext.commands import Context from more_itertools import chunked +from pydis_core.site_api import ResponseCodeError import bot from bot.log import get_logger diff --git a/bot/exts/filters/antispam.py b/bot/exts/filters/antispam.py index b4e7a33f0..d7783292d 100644 --- a/bot/exts/filters/antispam.py +++ b/bot/exts/filters/antispam.py @@ -8,9 +8,9 @@ from operator import attrgetter, itemgetter from typing import Dict, Iterable, List, Set import arrow -from botcore.utils import scheduling from discord import Colour, Member, Message, MessageType, NotFound, Object, TextChannel from discord.ext.commands import Cog +from pydis_core.utils import scheduling from bot import rules from bot.bot import Bot diff --git a/bot/exts/filters/filter_lists.py b/bot/exts/filters/filter_lists.py index c429b0eb9..538744204 100644 --- a/bot/exts/filters/filter_lists.py +++ b/bot/exts/filters/filter_lists.py @@ -5,9 +5,9 @@ from typing import Optional import arrow import discord -from botcore.site_api import ResponseCodeError from discord.ext import tasks from discord.ext.commands import BadArgument, Cog, Context, IDConverter, command, group, has_any_role +from pydis_core.site_api import ResponseCodeError from bot import constants from bot.bot import Bot diff --git a/bot/exts/filters/filtering.py b/bot/exts/filters/filtering.py index 23ce00c7d..23a6f2d92 100644 --- a/bot/exts/filters/filtering.py +++ b/bot/exts/filters/filtering.py @@ -10,13 +10,13 @@ import dateutil.parser import regex import tldextract from async_rediscache import RedisCache -from botcore.site_api import ResponseCodeError -from botcore.utils import scheduling -from botcore.utils.regex import DISCORD_INVITE from dateutil.relativedelta import relativedelta from discord import ChannelType, Colour, Embed, Forbidden, HTTPException, Member, Message, NotFound, TextChannel from discord.ext.commands import Cog from discord.utils import escape_markdown +from pydis_core.site_api import ResponseCodeError +from pydis_core.utils import scheduling +from pydis_core.utils.regex import DISCORD_INVITE from bot.bot import Bot from bot.constants import Bot as BotConfig, Channels, Colours, Filter, Guild, Icons, URLs diff --git a/bot/exts/fun/off_topic_names.py b/bot/exts/fun/off_topic_names.py index 5c5fa1dd5..86be8edae 100644 --- a/bot/exts/fun/off_topic_names.py +++ b/bot/exts/fun/off_topic_names.py @@ -6,11 +6,11 @@ import random from functools import partial from typing import Optional -from botcore.site_api import ResponseCodeError from discord import ButtonStyle, Colour, Embed, Interaction from discord.ext import tasks from discord.ext.commands import Cog, Context, group, has_any_role from discord.ui import Button, View +from pydis_core.site_api import ResponseCodeError from bot.bot import Bot from bot.constants import Bot as BotConfig, Channels, MODERATION_ROLES, NEGATIVE_REPLIES diff --git a/bot/exts/help_channels/_channel.py b/bot/exts/help_channels/_channel.py index 5fc39b623..74d65107b 100644 --- a/bot/exts/help_channels/_channel.py +++ b/bot/exts/help_channels/_channel.py @@ -3,7 +3,7 @@ import asyncio import textwrap import discord -from botcore.utils import members +from pydis_core.utils import members import bot from bot import constants diff --git a/bot/exts/info/codeblock/_cog.py b/bot/exts/info/codeblock/_cog.py index 0605a26e7..a431175fd 100644 --- a/bot/exts/info/codeblock/_cog.py +++ b/bot/exts/info/codeblock/_cog.py @@ -2,9 +2,9 @@ import time from typing import Optional import discord -from botcore.utils import scheduling from discord import Message, RawMessageUpdateEvent from discord.ext.commands import Cog +from pydis_core.utils import scheduling from bot import constants from bot.bot import Bot diff --git a/bot/exts/info/doc/_batch_parser.py b/bot/exts/info/doc/_batch_parser.py index 41a15fb6e..53d931830 100644 --- a/bot/exts/info/doc/_batch_parser.py +++ b/bot/exts/info/doc/_batch_parser.py @@ -8,8 +8,8 @@ from operator import attrgetter from typing import Deque, Dict, List, NamedTuple, Optional, Union import discord -from botcore.utils import scheduling from bs4 import BeautifulSoup +from pydis_core.utils import scheduling import bot from bot.constants import Channels diff --git a/bot/exts/info/doc/_cog.py b/bot/exts/info/doc/_cog.py index c35349c3c..2d0f28406 100644 --- a/bot/exts/info/doc/_cog.py +++ b/bot/exts/info/doc/_cog.py @@ -10,9 +10,9 @@ from typing import Dict, Literal, NamedTuple, Optional, Tuple, Union import aiohttp import discord -from botcore.site_api import ResponseCodeError -from botcore.utils.scheduling import Scheduler from discord.ext import commands +from pydis_core.site_api import ResponseCodeError +from pydis_core.utils.scheduling import Scheduler from bot.bot import Bot from bot.constants import MODERATION_ROLES, RedirectOutput diff --git a/bot/exts/info/information.py b/bot/exts/info/information.py index 733597dd8..1a6cfcb59 100644 --- a/bot/exts/info/information.py +++ b/bot/exts/info/information.py @@ -6,10 +6,10 @@ from textwrap import shorten from typing import Any, DefaultDict, Mapping, Optional, Set, Tuple, Union import rapidfuzz -from botcore.site_api import ResponseCodeError from discord import AllowedMentions, Colour, Embed, Guild, Message, Role from discord.ext.commands import BucketType, Cog, Context, Paginator, command, group, has_any_role from discord.utils import escape_markdown +from pydis_core.site_api import ResponseCodeError from bot import constants from bot.bot import Bot diff --git a/bot/exts/info/subscribe.py b/bot/exts/info/subscribe.py index e36ce807c..36304539f 100644 --- a/bot/exts/info/subscribe.py +++ b/bot/exts/info/subscribe.py @@ -5,9 +5,9 @@ from dataclasses import dataclass import arrow import discord -from botcore.utils import members from discord.ext import commands from discord.interactions import Interaction +from pydis_core.utils import members from bot import constants from bot.bot import Bot diff --git a/bot/exts/moderation/defcon.py b/bot/exts/moderation/defcon.py index 7c924ff14..ee870ea57 100644 --- a/bot/exts/moderation/defcon.py +++ b/bot/exts/moderation/defcon.py @@ -7,12 +7,12 @@ from typing import Optional, Union import arrow from async_rediscache import RedisCache -from botcore.utils import scheduling -from botcore.utils.scheduling import Scheduler from dateutil.relativedelta import relativedelta from discord import Colour, Embed, Forbidden, Member, TextChannel, User from discord.ext import tasks from discord.ext.commands import Cog, Context, group, has_any_role +from pydis_core.utils import scheduling +from pydis_core.utils.scheduling import Scheduler from redis import RedisError from bot.bot import Bot diff --git a/bot/exts/moderation/incidents.py b/bot/exts/moderation/incidents.py index 1ddbe9857..ce83ca3fe 100644 --- a/bot/exts/moderation/incidents.py +++ b/bot/exts/moderation/incidents.py @@ -6,8 +6,8 @@ from typing import Optional import discord from async_rediscache import RedisCache -from botcore.utils import scheduling from discord.ext.commands import Cog, Context, MessageConverter, MessageNotFound +from pydis_core.utils import scheduling from bot.bot import Bot from bot.constants import Channels, Colours, Emojis, Guild, Roles, Webhooks diff --git a/bot/exts/moderation/infraction/_scheduler.py b/bot/exts/moderation/infraction/_scheduler.py index 4c275a1f0..9b8e67ec5 100644 --- a/bot/exts/moderation/infraction/_scheduler.py +++ b/bot/exts/moderation/infraction/_scheduler.py @@ -7,9 +7,9 @@ from gettext import ngettext import arrow import dateutil.parser import discord -from botcore.site_api import ResponseCodeError -from botcore.utils import scheduling from discord.ext.commands import Context +from pydis_core.site_api import ResponseCodeError +from pydis_core.utils import scheduling from bot import constants from bot.bot import Bot diff --git a/bot/exts/moderation/infraction/_utils.py b/bot/exts/moderation/infraction/_utils.py index c03081b07..2cf7f8efb 100644 --- a/bot/exts/moderation/infraction/_utils.py +++ b/bot/exts/moderation/infraction/_utils.py @@ -2,8 +2,8 @@ import typing as t import arrow import discord -from botcore.site_api import ResponseCodeError from discord.ext.commands import Context +from pydis_core.site_api import ResponseCodeError import bot from bot.constants import Colours, Icons diff --git a/bot/exts/moderation/metabase.py b/bot/exts/moderation/metabase.py index c63019882..aeb589b5b 100644 --- a/bot/exts/moderation/metabase.py +++ b/bot/exts/moderation/metabase.py @@ -8,8 +8,8 @@ import arrow from aiohttp.client_exceptions import ClientResponseError from arrow import Arrow from async_rediscache import RedisCache -from botcore.utils.scheduling import Scheduler from discord.ext.commands import Cog, Context, group, has_any_role +from pydis_core.utils.scheduling import Scheduler from bot.bot import Bot from bot.constants import Metabase as MetabaseConfig, Roles diff --git a/bot/exts/moderation/modlog.py b/bot/exts/moderation/modlog.py index a1ed714be..d916d1f4d 100644 --- a/bot/exts/moderation/modlog.py +++ b/bot/exts/moderation/modlog.py @@ -6,13 +6,13 @@ from datetime import datetime, timezone from itertools import zip_longest import discord -from botcore.site_api import ResponseCodeError from dateutil.relativedelta import relativedelta from deepdiff import DeepDiff from discord import Colour, Message, Thread from discord.abc import GuildChannel from discord.ext.commands import Cog, Context from discord.utils import escape_markdown, format_dt, snowflake_time +from pydis_core.site_api import ResponseCodeError from sentry_sdk import add_breadcrumb from bot.bot import Bot diff --git a/bot/exts/moderation/modpings.py b/bot/exts/moderation/modpings.py index 7c8e4ac13..16423b3d0 100644 --- a/bot/exts/moderation/modpings.py +++ b/bot/exts/moderation/modpings.py @@ -3,10 +3,10 @@ import datetime import arrow from async_rediscache import RedisCache -from botcore.utils.scheduling import Scheduler from dateutil.parser import isoparse, parse as dateutil_parse from discord import Member from discord.ext.commands import Cog, Context, group, has_any_role +from pydis_core.utils.scheduling import Scheduler from bot.bot import Bot from bot.constants import Emojis, Guild, MODERATION_ROLES, Roles diff --git a/bot/exts/moderation/silence.py b/bot/exts/moderation/silence.py index 578551d24..682791593 100644 --- a/bot/exts/moderation/silence.py +++ b/bot/exts/moderation/silence.py @@ -5,11 +5,11 @@ from datetime import datetime, timedelta, timezone from typing import Optional, OrderedDict, Union from async_rediscache import RedisCache -from botcore.utils.scheduling import Scheduler from discord import Guild, PermissionOverwrite, TextChannel, Thread, VoiceChannel from discord.ext import commands, tasks from discord.ext.commands import Context from discord.utils import MISSING +from pydis_core.utils.scheduling import Scheduler from bot import constants from bot.bot import Bot diff --git a/bot/exts/moderation/stream.py b/bot/exts/moderation/stream.py index a96e96511..f0d8c23b8 100644 --- a/bot/exts/moderation/stream.py +++ b/bot/exts/moderation/stream.py @@ -5,8 +5,8 @@ import arrow import discord from arrow import Arrow from async_rediscache import RedisCache -from botcore.utils import scheduling from discord.ext import commands +from pydis_core.utils import scheduling from bot.bot import Bot from bot.constants import ( diff --git a/bot/exts/moderation/voice_gate.py b/bot/exts/moderation/voice_gate.py index 90f88d040..1901d1c57 100644 --- a/bot/exts/moderation/voice_gate.py +++ b/bot/exts/moderation/voice_gate.py @@ -5,9 +5,9 @@ from datetime import timedelta import arrow import discord from async_rediscache import RedisCache -from botcore.site_api import ResponseCodeError from discord import Colour, Member, VoiceState from discord.ext.commands import Cog, Context, command +from pydis_core.site_api import ResponseCodeError from bot.bot import Bot from bot.constants import Bot as BotConfig, Channels, MODERATION_ROLES, Roles, VoiceGate as GateConf diff --git a/bot/exts/moderation/watchchannels/_watchchannel.py b/bot/exts/moderation/watchchannels/_watchchannel.py index 6eaedf6b3..2871eb5de 100644 --- a/bot/exts/moderation/watchchannels/_watchchannel.py +++ b/bot/exts/moderation/watchchannels/_watchchannel.py @@ -7,10 +7,10 @@ from dataclasses import dataclass from typing import Any, Dict, Optional import discord -from botcore.site_api import ResponseCodeError -from botcore.utils import scheduling from discord import Color, DMChannel, Embed, HTTPException, Message, errors from discord.ext.commands import Cog, Context +from pydis_core.site_api import ResponseCodeError +from pydis_core.utils import scheduling from bot.bot import Bot from bot.constants import BigBrother as BigBrotherConfig, Guild as GuildConfig, Icons diff --git a/bot/exts/recruitment/talentpool/_api.py b/bot/exts/recruitment/talentpool/_api.py index 2cb15a14d..fee23826d 100644 --- a/bot/exts/recruitment/talentpool/_api.py +++ b/bot/exts/recruitment/talentpool/_api.py @@ -1,7 +1,7 @@ from datetime import datetime -from botcore.site_api import APIClient from pydantic import BaseModel, Field, parse_obj_as +from pydis_core.site_api import APIClient class NominationEntry(BaseModel): diff --git a/bot/exts/recruitment/talentpool/_cog.py b/bot/exts/recruitment/talentpool/_cog.py index 94737fc6c..dbc3ea538 100644 --- a/bot/exts/recruitment/talentpool/_cog.py +++ b/bot/exts/recruitment/talentpool/_cog.py @@ -5,10 +5,10 @@ from typing import Optional, Union import discord from async_rediscache import RedisCache -from botcore.site_api import ResponseCodeError from discord import Color, Embed, Member, PartialMessage, RawReactionActionEvent, User from discord.ext import commands, tasks from discord.ext.commands import BadArgument, Cog, Context, group, has_any_role +from pydis_core.site_api import ResponseCodeError from bot.bot import Bot from bot.constants import Bot as BotConfig, Channels, Emojis, Guild, MODERATION_ROLES, Roles, STAFF_ROLES diff --git a/bot/exts/recruitment/talentpool/_review.py b/bot/exts/recruitment/talentpool/_review.py index a74e1ce2b..876f95369 100644 --- a/bot/exts/recruitment/talentpool/_review.py +++ b/bot/exts/recruitment/talentpool/_review.py @@ -8,8 +8,8 @@ from collections import Counter from datetime import datetime, timedelta, timezone from typing import List, Optional, Union -from botcore.site_api import ResponseCodeError from discord import Embed, Emoji, Member, Message, NotFound, PartialMessage, TextChannel +from pydis_core.site_api import ResponseCodeError from bot.bot import Bot from bot.constants import Channels, Colours, Emojis, Guild, Roles diff --git a/bot/exts/utils/reminders.py b/bot/exts/utils/reminders.py index 803e2ea52..1991a687f 100644 --- a/bot/exts/utils/reminders.py +++ b/bot/exts/utils/reminders.py @@ -5,11 +5,11 @@ from datetime import datetime, timezone from operator import itemgetter import discord -from botcore.site_api import ResponseCodeError -from botcore.utils import scheduling -from botcore.utils.scheduling import Scheduler from dateutil.parser import isoparse from discord.ext.commands import Cog, Context, Greedy, group +from pydis_core.site_api import ResponseCodeError +from pydis_core.utils import scheduling +from pydis_core.utils.scheduling import Scheduler from bot.bot import Bot from bot.constants import ( @@ -218,7 +218,7 @@ class Reminders(Cog): """ Attempts to get content from the referenced message, if applicable. - Differs from botcore.utils.commands.clean_text_or_reply as allows for messages with no content. + Differs from pydis_core.utils.commands.clean_text_or_reply as allows for messages with no content. """ content = None if reference := ctx.message.reference: diff --git a/bot/exts/utils/snekbox.py b/bot/exts/utils/snekbox.py index 190956959..53012a5e1 100644 --- a/bot/exts/utils/snekbox.py +++ b/bot/exts/utils/snekbox.py @@ -7,10 +7,10 @@ from signal import Signals from textwrap import dedent from typing import Literal, Optional, Tuple -from botcore.utils import interactions -from botcore.utils.regex import FORMATTED_CODE_REGEX, RAW_CODE_REGEX from discord import AllowedMentions, HTTPException, Interaction, Message, NotFound, Reaction, User, enums, ui from discord.ext.commands import Cog, Command, Context, Converter, command, guild_only +from pydis_core.utils import interactions +from pydis_core.utils.regex import FORMATTED_CODE_REGEX, RAW_CODE_REGEX from bot.bot import Bot from bot.constants import Channels, MODERATION_ROLES, Roles, URLs diff --git a/bot/exts/utils/thread_bumper.py b/bot/exts/utils/thread_bumper.py index a2f208484..0384119f5 100644 --- a/bot/exts/utils/thread_bumper.py +++ b/bot/exts/utils/thread_bumper.py @@ -1,8 +1,8 @@ import typing as t import discord -from botcore.site_api import ResponseCodeError from discord.ext import commands +from pydis_core.site_api import ResponseCodeError from bot import constants from bot.bot import Bot diff --git a/bot/utils/messages.py b/bot/utils/messages.py index 8a968f659..27f2eac97 100644 --- a/bot/utils/messages.py +++ b/bot/utils/messages.py @@ -6,8 +6,8 @@ from io import BytesIO from typing import Callable, List, Optional, Sequence, Union import discord -from botcore.utils import scheduling from discord.ext.commands import Context +from pydis_core.utils import scheduling import bot from bot.constants import Emojis, MODERATION_ROLES, NEGATIVE_REPLIES diff --git a/tests/bot/exts/backend/sync/test_base.py b/tests/bot/exts/backend/sync/test_base.py index a17c1fa10..4dacfda17 100644 --- a/tests/bot/exts/backend/sync/test_base.py +++ b/tests/bot/exts/backend/sync/test_base.py @@ -1,7 +1,7 @@ import unittest from unittest import mock -from botcore.site_api import ResponseCodeError +from pydis_core.site_api import ResponseCodeError from bot.exts.backend.sync._syncers import Syncer from tests import helpers diff --git a/tests/bot/exts/backend/sync/test_cog.py b/tests/bot/exts/backend/sync/test_cog.py index 87b76c6b4..2ce950965 100644 --- a/tests/bot/exts/backend/sync/test_cog.py +++ b/tests/bot/exts/backend/sync/test_cog.py @@ -2,7 +2,7 @@ import unittest from unittest import mock import discord -from botcore.site_api import ResponseCodeError +from pydis_core.site_api import ResponseCodeError from bot import constants from bot.exts.backend import sync diff --git a/tests/bot/exts/backend/test_error_handler.py b/tests/bot/exts/backend/test_error_handler.py index 562c827b9..adb0252a5 100644 --- a/tests/bot/exts/backend/test_error_handler.py +++ b/tests/bot/exts/backend/test_error_handler.py @@ -1,8 +1,8 @@ import unittest from unittest.mock import AsyncMock, MagicMock, call, patch -from botcore.site_api import ResponseCodeError from discord.ext.commands import errors +from pydis_core.site_api import ResponseCodeError from bot.errors import InvalidInfractedUserError, LockedResourceError from bot.exts.backend import error_handler diff --git a/tests/bot/exts/filters/test_filtering.py b/tests/bot/exts/filters/test_filtering.py index bd26532f1..e47cf627b 100644 --- a/tests/bot/exts/filters/test_filtering.py +++ b/tests/bot/exts/filters/test_filtering.py @@ -11,7 +11,7 @@ class FilteringCogTests(unittest.IsolatedAsyncioTestCase): def setUp(self): """Instantiate the bot and cog.""" self.bot = MockBot() - with patch("botcore.utils.scheduling.create_task", new=lambda task, **_: task.close()): + with patch("pydis_core.utils.scheduling.create_task", new=lambda task, **_: task.close()): self.cog = filtering.Filtering(self.bot) @autospec(filtering.Filtering, "_get_filterlist_items", pass_mocks=False, return_value=["TOKEN"]) diff --git a/tests/bot/exts/moderation/infraction/test_utils.py b/tests/bot/exts/moderation/infraction/test_utils.py index 29dadf372..122935e37 100644 --- a/tests/bot/exts/moderation/infraction/test_utils.py +++ b/tests/bot/exts/moderation/infraction/test_utils.py @@ -3,8 +3,8 @@ from collections import namedtuple from datetime import datetime from unittest.mock import AsyncMock, MagicMock, patch -from botcore.site_api import ResponseCodeError from discord import Embed, Forbidden, HTTPException, NotFound +from pydis_core.site_api import ResponseCodeError from bot.constants import Colours, Icons from bot.exts.moderation.infraction import _utils as utils diff --git a/tests/helpers.py b/tests/helpers.py index a4b919dcb..4b980ac21 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -9,9 +9,9 @@ from typing import Iterable, Optional import discord from aiohttp import ClientSession -from botcore.async_stats import AsyncStatsClient -from botcore.site_api import APIClient from discord.ext.commands import Context +from pydis_core.async_stats import AsyncStatsClient +from pydis_core.site_api import APIClient from bot.bot import Bot from tests._autospec import autospec # noqa: F401 other modules import it via this module |