Improve import logic & __future__ annotations

discord/types/activity.py

@@ -25,18 +25,12 @@
 
 from __future__ import annotations
 
-import sys
 from typing import Literal
 
+from .._typed_dict import NotRequired, TypedDict
 from .snowflake import Snowflake
 from .user import PartialUser
 
-if sys.version_info >= (3, 11):
-    from typing import NotRequired, TypedDict
-else:
-    from typing_extensions import NotRequired, TypedDict
-
-
 StatusType = Literal["idle", "dnd", "online", "offline"]
 
 

discord/types/appinfo.py

@@ -25,17 +25,11 @@
 
 from __future__ import annotations
 
-import sys
-
+from .._typed_dict import NotRequired, TypedDict
 from .snowflake import Snowflake
 from .team import Team
 from .user import User
 
-if sys.version_info >= (3, 11):
-    from typing import NotRequired, TypedDict
-else:
-    from typing_extensions import NotRequired, TypedDict
-
 
 class BaseAppInfo(TypedDict):
     id: Snowflake

discord/types/audit_log.py

@@ -25,9 +25,9 @@
 
 from __future__ import annotations
 
-import sys
 from typing import Literal, Union
 
+from .._typed_dict import NotRequired, TypedDict
 from .automod import AutoModRule
 from .channel import ChannelType, PermissionOverwrite, VideoQualityMode
 from .guild import (
@@ -44,12 +44,6 @@
 from .user import User
 from .webhook import Webhook
 
-if sys.version_info >= (3, 11):
-    from typing import NotRequired, TypedDict
-else:
-    from typing_extensions import NotRequired, TypedDict
-
-
 AuditLogEvent = Literal[
     1,
     10,

discord/types/automod.py

@@ -22,17 +22,11 @@
 
 from __future__ import annotations
 
-import sys
 from typing import Literal
 
+from .._typed_dict import NotRequired, TypedDict
 from .snowflake import Snowflake
 
-if sys.version_info >= (3, 11):
-    from typing import NotRequired, TypedDict
-else:
-    from typing_extensions import NotRequired, TypedDict
-
-
 AutoModTriggerType = Literal[1, 2, 3, 4]
 
 AutoModEventType = Literal[1]

discord/types/channel.py

@@ -22,19 +22,15 @@
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 """
-import sys
-from typing import List, Literal, Optional, Union
+from __future__ import annotations
 
+from typing import Literal, Union
+
+from .._typed_dict import NotRequired, TypedDict
 from .snowflake import Snowflake
 from .threads import ThreadArchiveDuration, ThreadMember, ThreadMetadata
 from .user import PartialUser
 
-if sys.version_info >= (3, 11):
-    from typing import NotRequired, TypedDict
-else:
-    from typing_extensions import NotRequired, TypedDict
-
-
 OverwriteType = Literal[0, 1]
 
 
@@ -56,9 +52,9 @@ class _BaseChannel(TypedDict):
 class _BaseGuildChannel(_BaseChannel):
     guild_id: Snowflake
     position: int
-    permission_overwrites: List[PermissionOverwrite]
+    permission_overwrites: list[PermissionOverwrite]
     nsfw: bool
-    parent_id: Optional[Snowflake]
+    parent_id: Snowflake | None
 
 
 class PartialChannel(_BaseChannel):
@@ -67,7 +63,7 @@ class PartialChannel(_BaseChannel):
 
 class _TextChannelOptional(TypedDict, total=False):
     topic: str
-    last_message_id: Optional[Snowflake]
+    last_message_id: Snowflake | None
     last_pin_timestamp: str
     rate_limit_per_user: int
     default_auto_archive_duration: ThreadArchiveDuration
@@ -89,7 +85,7 @@ class NewsChannel(_BaseGuildChannel, _TextChannelOptional):
 
 
 class VoiceChannel(_BaseGuildChannel):
-    rtc_region: NotRequired[Optional[str]]
+    rtc_region: NotRequired[str | None]
     video_quality_mode: NotRequired[VideoQualityMode]
     type: Literal[2]
     bitrate: int
@@ -101,7 +97,7 @@ class CategoryChannel(_BaseGuildChannel):
 
 
 class StageChannel(_BaseGuildChannel):
-    rtc_region: NotRequired[Optional[str]]
+    rtc_region: NotRequired[str | None]
     topic: NotRequired[str]
     type: Literal[13]
     bitrate: int
@@ -112,7 +108,7 @@ class ThreadChannel(_BaseChannel):
     member: NotRequired[ThreadMember]
     owner_id: NotRequired[Snowflake]
     rate_limit_per_user: NotRequired[int]
-    last_message_id: NotRequired[Optional[Snowflake]]
+    last_message_id: NotRequired[Snowflake | None]
     last_pin_timestamp: NotRequired[str]
     type: Literal[10, 11, 12]
     guild_id: Snowflake
@@ -137,13 +133,13 @@ class ThreadChannel(_BaseChannel):
 class DMChannel(TypedDict):
     id: Snowflake
     type: Literal[1]
-    last_message_id: Optional[Snowflake]
-    recipients: List[PartialUser]
+    last_message_id: Snowflake | None
+    recipients: list[PartialUser]
 
 
 class GroupDMChannel(_BaseChannel):
     type: Literal[3]
-    icon: Optional[str]
+    icon: str | None
     owner_id: Snowflake
 
 

discord/types/components.py

@@ -25,16 +25,11 @@
 
 from __future__ import annotations
 
-import sys
 from typing import Literal, Union
 
+from .._typed_dict import NotRequired, TypedDict
 from .emoji import PartialEmoji
 
-if sys.version_info >= (3, 11):
-    from typing import NotRequired, TypedDict
-else:
-    from typing_extensions import NotRequired, TypedDict
-
 ComponentType = Literal[1, 2, 3, 4]
 ButtonStyle = Literal[1, 2, 3, 4, 5]
 InputTextStyle = Literal[1, 2]

discord/types/embed.py

@@ -22,13 +22,11 @@
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 """
-import sys
-from typing import List, Literal
+from __future__ import annotations
 
-if sys.version_info >= (3, 11):
-    from typing import NotRequired, TypedDict
-else:
-    from typing_extensions import NotRequired, TypedDict
+from typing import Literal
+
+from .._typed_dict import NotRequired, TypedDict
 
 
 class EmbedFooter(TypedDict):
@@ -94,4 +92,4 @@ class Embed(TypedDict, total=False):
     video: EmbedVideo
     provider: EmbedProvider
     author: EmbedAuthor
-    fields: List[EmbedField]
+    fields: list[EmbedField]

discord/types/emoji.py

@@ -22,16 +22,17 @@
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 """
+from __future__ import annotations
 
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 from .snowflake import Snowflake, SnowflakeList
 from .user import User
 
 
 class PartialEmoji(TypedDict):
-    id: Optional[Snowflake]
-    name: Optional[str]
+    id: Snowflake | None
+    name: str | None
 
 
 class Emoji(PartialEmoji, total=False):
@@ -45,4 +46,4 @@ class Emoji(PartialEmoji, total=False):
 
 class EditEmoji(TypedDict):
     name: str
-    roles: Optional[SnowflakeList]
+    roles: SnowflakeList | None

discord/types/guild.py

@@ -24,9 +24,9 @@
 """
 from __future__ import annotations
 
-import sys
 from typing import Literal
 
+from .._typed_dict import NotRequired, Required, TypedDict
 from .activity import PartialPresenceUpdate
 from .channel import GuildChannel
 from .emoji import Emoji
@@ -39,11 +39,6 @@
 from .voice import GuildVoiceState
 from .welcome_screen import WelcomeScreen
 
-if sys.version_info >= (3, 11):
-    from typing import NotRequired, Required, TypedDict
-else:
-    from typing_extensions import NotRequired, Required, TypedDict
-
 
 class Ban(TypedDict):
     reason: str | None

discord/types/integration.py

@@ -25,17 +25,12 @@
 
 from __future__ import annotations
 
-import sys
 from typing import Literal, Union
 
+from .._typed_dict import NotRequired, TypedDict
 from .snowflake import Snowflake
 from .user import User
 
-if sys.version_info >= (3, 11):
-    from typing import NotRequired, TypedDict
-else:
-    from typing_extensions import NotRequired, TypedDict
-
 
 class IntegrationApplication(TypedDict):
     bot: NotRequired[User]

discord/types/interactions.py

@@ -25,7 +25,6 @@
 
 from __future__ import annotations
 
-import sys
 from typing import TYPE_CHECKING, Literal, Union
 
 from ..permissions import Permissions
@@ -41,12 +40,7 @@
 if TYPE_CHECKING:
     from .message import AllowedMentions, Message
 
-
-if sys.version_info >= (3, 11):
-    from typing import NotRequired, TypedDict
-else:
-    from typing_extensions import NotRequired, TypedDict
-
+from .._typed_dict import NotRequired, TypedDict
 
 ApplicationCommandType = Literal[1, 2, 3]
 

discord/types/invite.py

@@ -25,21 +25,16 @@
 
 from __future__ import annotations
 
-import sys
 from typing import Literal, Union
 
+from .._typed_dict import NotRequired, TypedDict
 from .appinfo import PartialAppInfo
 from .channel import PartialChannel
 from .guild import InviteGuild, _GuildPreviewUnique
 from .scheduled_events import ScheduledEvent
 from .snowflake import Snowflake
 from .user import PartialUser
 
-if sys.version_info >= (3, 11):
-    from typing import NotRequired, TypedDict
-else:
-    from typing_extensions import NotRequired, TypedDict
-
 InviteTargetType = Literal[1, 2]
 
 

discord/types/message.py

@@ -25,7 +25,6 @@
 
 from __future__ import annotations
 
-import sys
 from typing import TYPE_CHECKING, Literal
 
 from .channel import ChannelType
@@ -41,11 +40,7 @@
 if TYPE_CHECKING:
     from .interactions import MessageInteraction
 
-
-if sys.version_info >= (3, 11):
-    from typing import NotRequired, TypedDict
-else:
-    from typing_extensions import NotRequired, TypedDict
+from .._typed_dict import NotRequired, TypedDict
 
 
 class ChannelMention(TypedDict):

discord/types/raw_models.py

@@ -22,19 +22,14 @@
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 """
-import sys
-from typing import List
+from __future__ import annotations
 
+from .._typed_dict import NotRequired, TypedDict
 from .automod import AutoModAction, AutoModTriggerType
 from .emoji import PartialEmoji
 from .member import Member
 from .snowflake import Snowflake
 
-if sys.version_info >= (3, 11):
-    from typing import NotRequired, TypedDict
-else:
-    from typing_extensions import NotRequired, TypedDict
-
 
 class _MessageEventOptional(TypedDict, total=False):
     guild_id: Snowflake
@@ -46,7 +41,7 @@ class MessageDeleteEvent(_MessageEventOptional):
 
 
 class BulkMessageDeleteEvent(_MessageEventOptional):
-    ids: List[Snowflake]
+    ids: list[Snowflake]
     channel_id: Snowflake
 
 

discord/types/role.py

@@ -25,15 +25,9 @@
 
 from __future__ import annotations
 
-import sys
-
+from .._typed_dict import NotRequired, TypedDict
 from .snowflake import Snowflake
 
-if sys.version_info >= (3, 11):
-    from typing import NotRequired, TypedDict
-else:
-    from typing_extensions import NotRequired, TypedDict
-
 
 class Role(TypedDict):
     tags: NotRequired[RoleTags]