diff --git a/pomice/__init__.py b/pomice/__init__.py index 84b4718..eea8b25 100644 --- a/pomice/__init__.py +++ b/pomice/__init__.py @@ -7,6 +7,7 @@ Copyright (c) 2023, cloudwithax Licensed under GPL-3.0 """ + import discord if not discord.version_info.major >= 2: @@ -31,7 +32,7 @@ from .events import * from .exceptions import * from .filters import * from .objects import * -from .queue import * from .player import * from .pool import * +from .queue import * from .routeplanner import * diff --git a/pomice/applemusic/__init__.py b/pomice/applemusic/__init__.py index d1ceb72..a2349fa 100644 --- a/pomice/applemusic/__init__.py +++ b/pomice/applemusic/__init__.py @@ -1,4 +1,5 @@ """Apple Music module for Pomice, made possible by cloudwithax 2023""" + from .client import * from .exceptions import * from .objects import * diff --git a/pomice/applemusic/objects.py b/pomice/applemusic/objects.py index 75d173d..548da38 100644 --- a/pomice/applemusic/objects.py +++ b/pomice/applemusic/objects.py @@ -1,4 +1,5 @@ """Module for managing Apple Music objects""" + from typing import List __all__ = ( diff --git a/pomice/events.py b/pomice/events.py index 0dbe0b4..f27bea4 100644 --- a/pomice/events.py +++ b/pomice/events.py @@ -1,10 +1,10 @@ from __future__ import annotations from abc import ABC +from typing import TYPE_CHECKING from typing import Any from typing import Optional from typing import Tuple -from typing import TYPE_CHECKING from discord import Client from discord import Guild diff --git a/pomice/player.py b/pomice/player.py index e062456..91376ee 100644 --- a/pomice/player.py +++ b/pomice/player.py @@ -1,11 +1,11 @@ from __future__ import annotations import time +from typing import TYPE_CHECKING from typing import Any from typing import Dict from typing import List from typing import Optional -from typing import TYPE_CHECKING from typing import Union from discord import Client @@ -14,6 +14,8 @@ from discord import VoiceChannel from discord import VoiceProtocol from discord.ext import commands +from pomice.utils import LavalinkVersion + from . import events from .enums import SearchType from .events import PomiceEvent @@ -30,11 +32,10 @@ from .objects import Playlist from .objects import Track from .pool import Node from .pool import NodePool -from pomice.utils import LavalinkVersion if TYPE_CHECKING: - from discord.types.voice import VoiceServerUpdate from discord.types.voice import GuildVoiceState + from discord.types.voice import VoiceServerUpdate __all__ = ("Filters", "Player") diff --git a/pomice/pool.py b/pomice/pool.py index 64564af..cab9c50 100644 --- a/pomice/pool.py +++ b/pomice/pool.py @@ -7,12 +7,12 @@ import re import time from os import path from pathlib import Path +from typing import TYPE_CHECKING from typing import Any from typing import Dict from typing import List from typing import Optional from typing import Type -from typing import TYPE_CHECKING from typing import Union from urllib.parse import quote @@ -28,8 +28,8 @@ from websockets import typing as wstype from . import __version__ from . import applemusic from . import spotify -from .enums import * from .enums import LogLevel +from .enums import * from .exceptions import InvalidSpotifyClientAuthorization from .exceptions import LavalinkVersionIncompatible from .exceptions import NodeConnectionFailure diff --git a/pomice/spotify/__init__.py b/pomice/spotify/__init__.py index e28be28..71ca60a 100644 --- a/pomice/spotify/__init__.py +++ b/pomice/spotify/__init__.py @@ -1,4 +1,5 @@ """Spotify module for Pomice, made possible by cloudwithax 2023""" + from .client import Client from .exceptions import * from .objects import *