fix without future-annotations

Author: onerandomusername

disnake/abc.py

@@ -5,7 +5,6 @@
 import asyncio
 import copy
 from abc import ABC
-from collections.abc import Callable, Mapping, Sequence
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -22,9 +21,6 @@
 from .enums import (
     ChannelType,
     PartyType,
-    ThreadLayout,
-    ThreadSortOrder,
-    VideoQualityMode,
     try_enum_to_int,
 )
 from .errors import ClientException
@@ -36,7 +32,6 @@
 from .partial_emoji import PartialEmoji
 from .permissions import PermissionOverwrite, Permissions
 from .role import Role
-from .sticker import GuildSticker, StandardSticker, StickerItem
 from .utils import _overload_with_permissions
 from .voice_client import VoiceClient, VoiceProtocol
 
@@ -52,6 +47,7 @@
 VoiceProtocolT = TypeVar("VoiceProtocolT", bound=VoiceProtocol)
 
 if TYPE_CHECKING:
+    from collections.abc import Callable, Mapping, Sequence
     from datetime import datetime
 
     from typing_extensions import Self
@@ -61,14 +57,20 @@
     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
     from .member import Member
     from .message import Message, MessageReference, PartialMessage
     from .poll import Poll
     from .state import ConnectionState
+    from .sticker import GuildSticker, StandardSticker, StickerItem
     from .threads import AnyThreadArchiveDuration, ForumTag
     from .types.channel import (
         Channel as ChannelPayload,

disnake/app_commands.py

@@ -5,14 +5,13 @@
 import math
 import re
 from abc import ABC
-from collections.abc import Mapping, Sequence
+from collections.abc import Mapping
 from typing import TYPE_CHECKING, ClassVar, TypeAlias
 
 from .enums import (
     ApplicationCommandPermissionType,
     ApplicationCommandType,
     ChannelType,
-    Locale,
     OptionType,
     enum_if_int,
     try_enum,
@@ -24,8 +23,13 @@
 from .utils import MISSING, _get_as_snowflake, _maybe_cast, deprecated, warn_deprecated
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
+
     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/appinfo.py

@@ -2,17 +2,19 @@
 
 from __future__ import annotations
 
-from collections.abc import Sequence
 from typing import TYPE_CHECKING, cast
 
 from . import utils
-from .asset import Asset, AssetBytes
+from .asset import Asset
 from .enums import ApplicationEventWebhookStatus, try_enum
 from .flags import ApplicationFlags
 from .permissions import Permissions
 from .utils import MISSING
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+    from .asset import AssetBytes
     from .guild import Guild
     from .state import ConnectionState
     from .types.appinfo 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

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable, Generator, Mapping
+from collections.abc import Callable
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -11,15 +11,14 @@
     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
 from .object import Object
-from .partial_emoji import PartialEmoji
 from .permissions import PermissionOverwrite, Permissions
 from .threads import ForumTag, Thread
 
@@ -32,14 +31,17 @@
 
 if TYPE_CHECKING:
     import datetime
+    from collections.abc import Generator, Mapping
 
+    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
     from .integrations import PartialIntegration
     from .member import Member
+    from .partial_emoji import PartialEmoji
     from .role import Role
     from .stage_instance import StageInstance
     from .sticker import GuildSticker

disnake/automod.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import datetime
-from collections.abc import Iterable, Sequence
 from typing import (
     TYPE_CHECKING,
     overload,
@@ -21,6 +20,8 @@
 from .utils import MISSING, _get_as_snowflake, snowflake_time
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable, Sequence
+
     from typing_extensions import Self
 
     from .abc import Snowflake

disnake/backoff.py

@@ -4,8 +4,10 @@
 
 import random
 import time
-from collections.abc import Callable
-from typing import Generic, Literal, TypeVar, overload
+from typing import TYPE_CHECKING, Generic, Literal, TypeVar, overload
+
+if TYPE_CHECKING:
+    from collections.abc import Callable
 
 T = TypeVar("T", bool, Literal[True], Literal[False])
 

disnake/bans.py

@@ -2,12 +2,13 @@
 
 from __future__ import annotations
 
-from collections.abc import Sequence
 from typing import TYPE_CHECKING, NamedTuple
 
 __all__ = ("BanEntry",)
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
+
     from .abc import Snowflake
     from .user import User
 

disnake/channel.py

@@ -3,9 +3,7 @@
 from __future__ import annotations
 
 import asyncio
-import datetime
 import time
-from collections.abc import Callable, Iterable, Mapping, Sequence
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -32,13 +30,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
@@ -59,16 +57,22 @@
 )
 
 if TYPE_CHECKING:
+    import datetime
+    from collections.abc import Callable, Iterable, Mapping, Sequence
+
     from typing_extensions import Never, Self
 
     from .abc import Snowflake, SnowflakeTime
     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,8 +8,8 @@
 import sys
 import traceback
 import types
-from collections.abc import Callable, Coroutine, Generator, Mapping, Sequence
-from datetime import datetime, timedelta
+from collections.abc import Callable, Coroutine
+from datetime import timedelta
 from errno import ECONNRESET
 from typing import (
     TYPE_CHECKING,
@@ -24,21 +24,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,
@@ -47,23 +45,21 @@
     PrivilegedIntentsRequired,
     SessionStartLimitReached,
 )
-from .flags import ApplicationFlags, Intents, MemberCacheFlags
 from .gateway import DiscordWebSocket, ReconnectWebSocket
 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 .threads import Thread
 from .ui.view import View
 from .user import ClientUser, User
 from .utils import MISSING, deprecated
@@ -73,14 +69,31 @@
 from .widget import Widget
 
 if TYPE_CHECKING:
+    from collections.abc import Generator, Mapping, Sequence
+    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 .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,
     )