fix with future-annotations

Author: onerandomusername

disnake/abc.py

@@ -28,9 +28,6 @@
 from .enums import (
     ChannelType,
     PartyType,
-    ThreadLayout,
-    ThreadSortOrder,
-    VideoQualityMode,
     try_enum_to_int,
 )
 from .errors import ClientException
@@ -66,7 +63,12 @@
     from .client import Client
     from .embeds import Embed
     from .emoji import Emoji
-    from .enums import InviteTarget
+    from .enums import (
+        InviteTarget,
+        ThreadLayout,
+        ThreadSortOrder,
+        VideoQualityMode,
+    )
     from .guild import Guild, GuildChannel as AnyGuildChannel, GuildMessageable
     from .guild_scheduled_event import GuildScheduledEvent
     from .iterators import ChannelPinsIterator, HistoryIterator

disnake/app_commands.py

@@ -11,7 +11,6 @@
     ApplicationCommandPermissionType,
     ApplicationCommandType,
     ChannelType,
-    Locale,
     OptionType,
     enum_if_int,
     try_enum,
@@ -25,6 +24,9 @@
 if TYPE_CHECKING:
     from typing_extensions import Self
 
+    from .enums import (
+        Locale,
+    )
     from .i18n import LocalizationProtocol, LocalizationValue, LocalizedOptional, LocalizedRequired
     from .state import ConnectionState
     from .types.interactions import (

disnake/application_role_connection.py

@@ -5,12 +5,12 @@
 from typing import TYPE_CHECKING
 
 from .enums import ApplicationRoleConnectionMetadataType, enum_if_int, try_enum
-from .i18n import LocalizationValue, Localized
+from .i18n import Localized
 
 if TYPE_CHECKING:
     from typing_extensions import Self
 
-    from .i18n import LocalizationProtocol, LocalizedRequired
+    from .i18n import LocalizationProtocol, LocalizationValue, LocalizedRequired
     from .types.application_role_connection import (
         ApplicationRoleConnectionMetadata as ApplicationRoleConnectionMetadataPayload,
     )

disnake/audit_logs.py

@@ -19,10 +19,10 @@
     cast,
 )
 
-from . import abc, enums, flags, utils
+from . import enums, flags, utils
 from .app_commands import ApplicationCommandPermissions
 from .asset import Asset
-from .automod import AutoModAction, AutoModTriggerMetadata, _automod_action_factory
+from .automod import AutoModTriggerMetadata, _automod_action_factory
 from .colour import Colour
 from .invite import Invite
 from .mixins import Hashable
@@ -40,8 +40,9 @@
 if TYPE_CHECKING:
     import datetime
 
+    from . import abc
     from .app_commands import APIApplicationCommand
-    from .automod import AutoModRule
+    from .automod import AutoModAction, AutoModRule
     from .emoji import Emoji
     from .guild import Guild
     from .guild_scheduled_event import GuildScheduledEvent

disnake/channel.py

@@ -40,13 +40,13 @@
 )
 from .errors import ClientException
 from .file import File
-from .flags import ChannelFlags, MessageFlags
+from .flags import ChannelFlags
 from .iterators import ArchivedThreadIterator
 from .mixins import Hashable
 from .object import Object
 from .partial_emoji import PartialEmoji
-from .permissions import PermissionOverwrite, Permissions
-from .soundboard import GuildSoundboardSound, PartialSoundboardSound, SoundboardSound
+from .permissions import Permissions
+from .soundboard import GuildSoundboardSound, PartialSoundboardSound
 from .stage_instance import StageInstance
 from .threads import ForumTag, Thread
 from .utils import MISSING
@@ -75,10 +75,13 @@
     from .asset import AssetBytes
     from .embeds import Embed
     from .emoji import Emoji
+    from .flags import MessageFlags
     from .guild import Guild, GuildChannel as GuildChannelType
     from .member import Member, VoiceState
     from .message import AllowedMentions, Message, PartialMessage
+    from .permissions import PermissionOverwrite
     from .role import Role
+    from .soundboard import SoundboardSound
     from .state import ConnectionState
     from .sticker import GuildSticker, StandardSticker, StickerItem
     from .threads import AnyThreadArchiveDuration, ThreadType

disnake/client.py

@@ -8,7 +8,7 @@
 import sys
 import traceback
 import types
-from datetime import datetime, timedelta
+from datetime import timedelta
 from errno import ECONNRESET
 from typing import (
     TYPE_CHECKING,
@@ -33,20 +33,19 @@
 import aiohttp
 
 from . import abc, utils
-from .activity import ActivityTypes, BaseActivity, create_activity
+from .activity import BaseActivity, create_activity
 from .app_commands import (
     APIMessageCommand,
     APISlashCommand,
     APIUserCommand,
-    ApplicationCommand,
-    GuildApplicationCommandPermissions,
 )
 from .appinfo import AppInfo
 from .application_role_connection import ApplicationRoleConnectionMetadata
 from .backoff import ExponentialBackoff
 from .channel import PartialMessageable, _threaded_channel_factory
+from .emoji import Emoji
 from .entitlement import Entitlement
-from .enums import ApplicationCommandType, ChannelType, Event, Status
+from .enums import ChannelType, Event, Status
 from .errors import (
     ConnectionClosed,
     GatewayNotFound,
@@ -59,16 +58,16 @@
 from .guild import Guild, GuildBuilder
 from .guild_preview import GuildPreview
 from .http import HTTPClient
-from .i18n import LocalizationProtocol, LocalizationStore
+from .i18n import LocalizationStore
 from .invite import Invite
 from .iterators import EntitlementIterator, GuildIterator
 from .mentions import AllowedMentions
 from .object import Object
 from .sku import SKU
-from .soundboard import GuildSoundboardSound, SoundboardSound
+from .soundboard import SoundboardSound
 from .stage_instance import StageInstance
 from .state import ConnectionState
-from .sticker import GuildSticker, StandardSticker, StickerPack, _sticker_factory
+from .sticker import StickerPack, _sticker_factory
 from .template import Template
 from .ui.view import View
 from .user import ClientUser, User
@@ -79,16 +78,29 @@
 from .widget import Widget
 
 if TYPE_CHECKING:
+    from datetime import datetime
+
     from typing_extensions import NotRequired
 
     from .abc import GuildChannel, PrivateChannel, Snowflake, SnowflakeTime
-    from .app_commands import APIApplicationCommand, MessageCommand, SlashCommand, UserCommand
+    from .activity import ActivityTypes
+    from .app_commands import (
+        APIApplicationCommand,
+        ApplicationCommand,
+        GuildApplicationCommandPermissions,
+        MessageCommand,
+        SlashCommand,
+        UserCommand,
+    )
     from .asset import AssetBytes
     from .channel import DMChannel
-    from .emoji import Emoji
+    from .enums import ApplicationCommandType
     from .flags import ApplicationFlags, Intents, MemberCacheFlags
+    from .i18n import LocalizationProtocol
     from .member import Member
     from .message import Message
+    from .soundboard import GuildSoundboardSound
+    from .sticker import GuildSticker, StandardSticker
     from .threads import Thread
     from .types.application_role_connection import (
         ApplicationRoleConnectionMetadata as ApplicationRoleConnectionMetadataPayload,

disnake/ext/commands/base_core.py

@@ -31,7 +31,7 @@
     maybe_coroutine,
 )
 
-from .cooldowns import BucketType, CooldownMapping, MaxConcurrency
+from .cooldowns import BucketType, CooldownMapping
 from .errors import CheckFailure, CommandError, CommandInvokeError, CommandOnCooldown
 
 if TYPE_CHECKING:
@@ -42,6 +42,7 @@
 
     from ._types import AppCheck, Coro, Error, Hook
     from .cog import Cog
+    from .cooldowns import MaxConcurrency
     from .interaction_bot_base import InteractionBotBase
 
     ApplicationCommandInteractionT = TypeVar(

disnake/ext/commands/converter.py

@@ -25,7 +25,7 @@
 
 import disnake
 
-from .context import AnyContext, Context
+from .context import Context
 from .errors import (
     BadArgument,
     BadBoolArgument,
@@ -55,6 +55,8 @@
 if TYPE_CHECKING:
     from disnake.abc import MessageableChannel
 
+    from .context import AnyContext
+
 
 # TODO: USE ACTUAL FUNCTIONS INSTEAD OF USELESS CLASSES
 

disnake/ext/commands/core.py

@@ -37,7 +37,7 @@
 
 from ._types import _BaseCommand
 from .cog import Cog
-from .context import AnyContext, Context
+from .context import Context
 from .converter import Greedy, get_converter, run_converters
 from .cooldowns import BucketType, Cooldown, CooldownMapping, DynamicCooldownMapping, MaxConcurrency
 from .errors import (
@@ -69,6 +69,7 @@
     from disnake.message import Message
 
     from ._types import AppCheck, Check, Coro, CoroFunc, Error, Hook
+    from .context import AnyContext
 
 
 __all__ = (

disnake/ext/commands/interaction_bot_base.py

@@ -39,7 +39,7 @@
 )
 from .errors import CommandRegistrationError
 from .flags import CommandSyncFlags
-from .slash_core import InvokableSlashCommand, SubCommand, SubCommandGroup, slash_command
+from .slash_core import InvokableSlashCommand, SubCommandGroup, slash_command
 
 if TYPE_CHECKING:
     from typing_extensions import NotRequired, ParamSpec
@@ -61,6 +61,7 @@
         InteractionCommandCallback,
         InvokableApplicationCommand,
     )
+    from .slash_core import SubCommand
 
     P = ParamSpec("P")