♻️ Use typing_extensions instead of _typed_dict

Pycord-Development · Oct 29, 2024 · ace2c1d · ace2c1d
1 parent 8ed5ae5
commit ace2c1d
Show file tree

Hide file tree

Showing 26 changed files with 44 additions and 63 deletions.
diff --git a/discord/_typed_dict.py b/discord/_typed_dict.py
diff --git a/discord/_version.py b/discord/_version.py
@@ -30,7 +30,7 @@
 import warnings
 from importlib.metadata import PackageNotFoundError, version
 
-from ._typed_dict import TypedDict
+from typing_extensions import TypedDict
 
 __all__ = ("__version__", "VersionInfo", "version_info")
 

diff --git a/discord/types/activity.py b/discord/types/activity.py
@@ -27,7 +27,8 @@
 
 from typing import Literal
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
+
 from .snowflake import Snowflake
 from .user import PartialUser
 

diff --git a/discord/types/appinfo.py b/discord/types/appinfo.py
@@ -25,7 +25,8 @@
 
 from __future__ import annotations
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
+
 from .snowflake import Snowflake
 from .team import Team
 from .user import User

diff --git a/discord/types/application_role_connection.py b/discord/types/application_role_connection.py
@@ -26,7 +26,7 @@
 
 from typing import Literal
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
 
 ApplicationRoleConnectionMetadataType = Literal[1, 2, 3, 4, 5, 6, 7, 8]
 

diff --git a/discord/types/audit_log.py b/discord/types/audit_log.py
@@ -27,7 +27,8 @@
 
 from typing import Literal, Union
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
+
 from .automod import AutoModRule
 from .channel import ChannelType, PermissionOverwrite, VideoQualityMode
 from .guild import (

diff --git a/discord/types/automod.py b/discord/types/automod.py
@@ -24,7 +24,8 @@
 
 from typing import Literal
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
+
 from .snowflake import Snowflake
 
 AutoModTriggerType = Literal[1, 2, 3, 4, 5]

diff --git a/discord/types/channel.py b/discord/types/channel.py
@@ -27,7 +27,8 @@
 
 from typing import Literal, Union
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
+
 from ..enums import SortOrder
 from ..flags import ChannelFlags
 from .snowflake import Snowflake

diff --git a/discord/types/components.py b/discord/types/components.py
@@ -27,7 +27,8 @@
 
 from typing import Literal, Union
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
+
 from .channel import ChannelType
 from .emoji import PartialEmoji
 from .snowflake import Snowflake

diff --git a/discord/types/embed.py b/discord/types/embed.py
@@ -27,7 +27,7 @@
 
 from typing import Literal
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
 
 
 class EmbedFooter(TypedDict):

diff --git a/discord/types/guild.py b/discord/types/guild.py
@@ -27,7 +27,8 @@
 
 from typing import Literal
 
-from .._typed_dict import NotRequired, Required, TypedDict
+from typing_extensions import NotRequired, Required, TypedDict
+
 from .activity import PartialPresenceUpdate
 from .channel import GuildChannel
 from .emoji import Emoji

diff --git a/discord/types/integration.py b/discord/types/integration.py
@@ -27,7 +27,8 @@
 
 from typing import Literal, Union
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
+
 from .snowflake import Snowflake
 from .user import User
 

diff --git a/discord/types/interactions.py b/discord/types/interactions.py
@@ -42,7 +42,7 @@
     from .message import AllowedMentions, Message
     from ..interactions import InteractionChannel
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
 
 ApplicationCommandType = Literal[1, 2, 3]
 

diff --git a/discord/types/invite.py b/discord/types/invite.py
@@ -27,7 +27,8 @@
 
 from typing import Literal, Union
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
+
 from .appinfo import PartialAppInfo
 from .channel import PartialChannel
 from .guild import InviteGuild, _GuildPreviewUnique

diff --git a/discord/types/message.py b/discord/types/message.py
@@ -41,7 +41,7 @@
 if TYPE_CHECKING:
     from .interactions import InteractionMetadata, MessageInteraction
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
 
 
 class ChannelMention(TypedDict):

diff --git a/discord/types/monetization.py b/discord/types/monetization.py
@@ -27,7 +27,8 @@
 
 from typing import Literal
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
+
 from .snowflake import Snowflake
 
 SKUType = Literal[5, 6]

diff --git a/discord/types/onboarding.py b/discord/types/onboarding.py
@@ -26,7 +26,8 @@
 
 from typing import Literal, TypedDict
 
-from .._typed_dict import NotRequired
+from typing_extensions import NotRequired
+
 from .emoji import Emoji
 from .snowflake import Snowflake, SnowflakeList
 

diff --git a/discord/types/poll.py b/discord/types/poll.py
@@ -26,7 +26,8 @@
 
 from typing import Literal, TypedDict
 
-from .._typed_dict import NotRequired
+from typing_extensions import NotRequired
+
 from .emoji import Emoji
 
 PollLayoutType = Literal[1]

diff --git a/discord/types/raw_models.py b/discord/types/raw_models.py
@@ -25,7 +25,8 @@
 
 from __future__ import annotations
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
+
 from .automod import AutoModAction, AutoModTriggerType
 from .emoji import PartialEmoji
 from .member import Member

diff --git a/discord/types/role.py b/discord/types/role.py
@@ -25,7 +25,8 @@
 
 from __future__ import annotations
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
+
 from .snowflake import Snowflake
 
 

diff --git a/discord/types/sticker.py b/discord/types/sticker.py
@@ -27,7 +27,8 @@
 
 from typing import Literal, Union
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
+
 from .snowflake import Snowflake
 from .user import User
 

diff --git a/discord/types/threads.py b/discord/types/threads.py
@@ -27,7 +27,8 @@
 
 from typing import Literal
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
+
 from ..flags import ChannelFlags
 from .snowflake import Snowflake
 

diff --git a/discord/types/voice.py b/discord/types/voice.py
@@ -27,7 +27,8 @@
 
 from typing import Literal
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
+
 from .member import MemberWithUser
 from .snowflake import Snowflake
 

diff --git a/discord/types/webhook.py b/discord/types/webhook.py
@@ -27,7 +27,8 @@
 
 from typing import Literal
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
+
 from .channel import PartialChannel
 from .snowflake import Snowflake
 from .user import User

diff --git a/discord/types/widget.py b/discord/types/widget.py
@@ -25,7 +25,8 @@
 
 from __future__ import annotations
 
-from .._typed_dict import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
+
 from .activity import Activity
 from .snowflake import Snowflake
 from .user import User

diff --git a/requirements/_.txt b/requirements/_.txt
@@ -1,2 +1,2 @@
 aiohttp>=3.6.0,<4.0
-typing_extensions>=4,<5; python_version < "3.11"
+typing_extensions>=4,<5