Skip to content

refactor: ♻️ Use typing_extensions instead of _typed_dict #2621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 5, 2025
Merged

refactor: ♻️ Use typing_extensions instead of _typed_dict #2621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
77f5683
:recycle: Use `typing_extensions` instead of `_typed_dict`
Paillat-dev Oct 24, 2024
99a1f76
Merge branch 'master' into typed-dict
Paillat-dev Nov 7, 2024
7efb6d8
Merge branch 'master' into typed-dict
Dorukyum Nov 12, 2024
43d218e
Merge branch 'master' into typed-dict
Paillat-dev Nov 15, 2024
9e136be
Merge branch 'master' into typed-dict
Paillat-dev Nov 28, 2024
3d2bb4b
Merge branch 'master' into typed-dict
Dorukyum Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 0 additions & 38 deletions discord/_typed_dict.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion discord/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
3 changes: 2 additions & 1 deletion discord/types/activity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion discord/types/appinfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion discord/types/application_role_connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
3 changes: 2 additions & 1 deletion discord/types/audit_log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
3 changes: 2 additions & 1 deletion discord/types/automod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
3 changes: 2 additions & 1 deletion discord/types/channel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion discord/types/components.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion discord/types/embed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

from typing import Literal

from .._typed_dict import NotRequired, TypedDict
from typing_extensions import NotRequired, TypedDict


class EmbedFooter(TypedDict):
Expand Down
3 changes: 2 additions & 1 deletion discord/types/guild.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion discord/types/integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion discord/types/interactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
3 changes: 2 additions & 1 deletion discord/types/invite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion discord/types/message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
3 changes: 2 additions & 1 deletion discord/types/monetization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
3 changes: 2 additions & 1 deletion discord/types/onboarding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion discord/types/poll.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
3 changes: 2 additions & 1 deletion discord/types/raw_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion discord/types/role.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@

from __future__ import annotations

from .._typed_dict import NotRequired, TypedDict
from typing_extensions import NotRequired, TypedDict

from .snowflake import Snowflake


Expand Down
3 changes: 2 additions & 1 deletion discord/types/sticker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion discord/types/threads.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion discord/types/voice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion discord/types/webhook.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion discord/types/widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/_.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
aiohttp>=3.6.0,<4.0
typing_extensions>=4,<5; python_version < "3.11"
typing_extensions>=4,<5
Loading