From c6fa5620f470b3e4c5ad0efddb79f8341804b6af Mon Sep 17 00:00:00 2001 From: Drapersniper <27962761+drapersniper@users.noreply.github.com> Date: Tue, 23 Jun 2020 14:34:13 +0100 Subject: [PATCH] fix imports --- redbot/core/apis/audio/__init__.py | 3 +-- redbot/core/apis/audio/_internal/nodes/connection.py | 3 +-- redbot/core/apis/audio/_internal/nodes/events.py | 4 ++-- redbot/core/apis/audio/_internal/nodes/managed.py | 2 +- .../apis/audio/_internal/setting_cache/local_cache_level.py | 2 +- redbot/core/apis/audio/config.py | 3 ++- redbot/core/bot.py | 4 ++-- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/redbot/core/apis/audio/__init__.py b/redbot/core/apis/audio/__init__.py index 354bf1fc6..42063792a 100644 --- a/redbot/core/apis/audio/__init__.py +++ b/redbot/core/apis/audio/__init__.py @@ -14,7 +14,6 @@ from ._internal.wavelink.overwrites import ( ) from ._internal.wavelink.events import QueueEnd as QueueEnd from ._internal.playlists.enums import PlaylistScope as PlaylistScope - from . import config from .config import _init as _init - +from . import _internal as _internal diff --git a/redbot/core/apis/audio/_internal/nodes/connection.py b/redbot/core/apis/audio/_internal/nodes/connection.py index eeae184d2..6abaec50a 100644 --- a/redbot/core/apis/audio/_internal/nodes/connection.py +++ b/redbot/core/apis/audio/_internal/nodes/connection.py @@ -4,8 +4,7 @@ import copy import typing from .managed import managed_lavalink_connect_task_event -from redbot.core.apis.audio import constants -from redbot.core.apis.audio import config +from ... import constants, config if typing.TYPE_CHECKING: from redbot.core.bot import Red diff --git a/redbot/core/apis/audio/_internal/nodes/events.py b/redbot/core/apis/audio/_internal/nodes/events.py index e5050ff33..f4eb31ced 100644 --- a/redbot/core/apis/audio/_internal/nodes/events.py +++ b/redbot/core/apis/audio/_internal/nodes/events.py @@ -8,8 +8,8 @@ import wavelink from redbot.core import commands from redbot.core.bot import Red -from redbot.core.apis.audio._internal.wavelink.events import QueueEnd -from redbot.core.apis.audio._internal.wavelink import RedNode +from ..wavelink.events import QueueEnd +from ..wavelink.overwrites import RedNode log = logging.getLogger("red.core.apis.audio.nodes") diff --git a/redbot/core/apis/audio/_internal/nodes/managed.py b/redbot/core/apis/audio/_internal/nodes/managed.py index bc099ff2d..512d89fd6 100644 --- a/redbot/core/apis/audio/_internal/nodes/managed.py +++ b/redbot/core/apis/audio/_internal/nodes/managed.py @@ -15,7 +15,7 @@ import aiohttp from tqdm import tqdm from redbot.core import Config -from redbot.core.apis.audio import constants, regex, errors +from ... import constants, regex, errors __all__ = [ "managed_lavalink_connect_task_event", diff --git a/redbot/core/apis/audio/_internal/setting_cache/local_cache_level.py b/redbot/core/apis/audio/_internal/setting_cache/local_cache_level.py index 47ca46572..12b598bb5 100644 --- a/redbot/core/apis/audio/_internal/setting_cache/local_cache_level.py +++ b/redbot/core/apis/audio/_internal/setting_cache/local_cache_level.py @@ -7,7 +7,7 @@ import discord from redbot.core import Config from redbot.core.bot import Red -from redbot.core.apis.audio._internal.abstract import CacheLevel +from ..abstract import CacheLevel class LocalCacheLevelManager: diff --git a/redbot/core/apis/audio/config.py b/redbot/core/apis/audio/config.py index 4d185f0dc..341d362ee 100644 --- a/redbot/core/apis/audio/config.py +++ b/redbot/core/apis/audio/config.py @@ -4,8 +4,9 @@ from typing import TYPE_CHECKING, Optional from redbot.core import Config -from . import SettingCacheManager, constants +from . import constants from ._internal.playlists.enums import PlaylistScope +from ._internal.setting_cache import SettingCacheManager if TYPE_CHECKING: from redbot.core.bot import Red diff --git a/redbot/core/bot.py b/redbot/core/bot.py index a8ae744b5..af7239276 100644 --- a/redbot/core/bot.py +++ b/redbot/core/bot.py @@ -188,7 +188,7 @@ class RedBase( self._permissions_hooks: List[commands.CheckPredicate] = [] self._red_ready = asyncio.Event() self._red_before_invoke_objs: Set[PreInvokeCoroutine] = set() - from redbot.core.apis.audio._internal.wavelink import ( + from redbot.core.apis.audio import ( RedClient, ) # This is needed to avoid objects not being ready @@ -590,7 +590,7 @@ class RedBase( from .apis import audio # This is needed to avoid objects not being ready await audio._init(self) - self.add_cog(redbot.core.apis.audio._internal.nodes.AudioAPIEvents(self)) + self.add_cog(audio._internal.nodes.AudioAPIEvents(self)) packages = []