Pycord-Development · vmphase · Jul 30, 2026 · Jul 30, 2026 · Jul 30, 2026 · Jul 30, 2026
@@ -33,8 +33,7 @@
 
 if TYPE_CHECKING:
     from collections.abc import Awaitable, Callable
-
-    from typing_extensions import ParamSpec
+    from typing import ParamSpec
 
     import discord
 

@@ -31,7 +31,6 @@
 import inspect
 import re
 import types
-from collections import OrderedDict
 from collections.abc import Callable, Coroutine, Generator
 from enum import Enum
 from typing import (
@@ -84,9 +83,9 @@
 )
 
 if TYPE_CHECKING:
-    from typing import Concatenate
+    from typing import Concatenate, ParamSpec
 
-    from typing_extensions import Never, ParamSpec
+    from typing_extensions import Never
 
     from .. import Permissions
     from ..bot import C
@@ -479,7 +478,7 @@ async def dispatch_error(self, ctx: ApplicationContext, error: Exception) -> Non
             ctx.bot.dispatch("application_command_error", ctx, error)
 
     def _get_signature_parameters(self):
-        return OrderedDict(inspect.signature(self.callback).parameters)
+        return dict(inspect.signature(self.callback).parameters)
 
     def error(self, coro):
         """A decorator that registers a coroutine as a local error handler.
@@ -915,7 +914,7 @@ def _match_option_param_names(self, params, options):
                 )
             o._parameter_name = p_name
 
-        left_out_params = OrderedDict()
+        left_out_params = {}
         for k, v in params:
             left_out_params[k] = v
         options.extend(self._parse_options(left_out_params, check_params=False))

@@ -840,11 +840,10 @@ def from_datatype(cls, datatype):
             else:
                 raise TypeError("Invalid usage of typing.Union")
 
-        py_3_10_union_type = hasattr(types, "UnionType") and isinstance(
-            datatype, types.UnionType
-        )
-
-        if py_3_10_union_type or getattr(datatype, "__origin__", None) is Union:
+        if (
+            isinstance(datatype, types.UnionType)
+            or getattr(datatype, "__origin__", None) is Union
+        ):
             # Python 3.10+ "|" operator or typing.Union has been used. The __args__ attribute is a tuple of the types.
             # Type checking fails for this case, so ignore it.
             return cls.from_datatype(datatype.__args__)  # type: ignore

@@ -23,6 +23,8 @@
 DEALINGS IN THE SOFTWARE.
 """
 
+from __future__ import annotations
+
 from collections.abc import Callable, Coroutine
 from typing import TYPE_CHECKING, Any, TypeVar, Union
 

@@ -34,7 +34,7 @@
 from discord.message import Message
 
 if TYPE_CHECKING:
-    from typing_extensions import ParamSpec
+    from typing import ParamSpec
 
     from discord.abc import MessageableChannel
     from discord.guild import Guild
@@ -311,7 +311,11 @@ def me(self) -> Member | ClientUser:
         message contexts, or when :meth:`Intents.guilds` is absent.
         """
         # bot.user will never be None at this point.
-        return self.guild.me if self.guild is not None and self.guild.me is not None else self.bot.user  # type: ignore
+        return (
+            self.guild.me
+            if self.guild is not None and self.guild.me is not None
+            else self.bot.user
+        )  # type: ignore
 
     @property
     def voice_client(self) -> VoiceProtocol | None:

@@ -29,7 +29,7 @@
 import time
 from collections import deque
 from collections.abc import Callable
-from typing import TYPE_CHECKING, Any, Deque, TypeVar
+from typing import TYPE_CHECKING, Any, TypeVar
 
 import discord.abc
 from discord.enums import Enum
@@ -83,7 +83,11 @@ def get_key(self, msg: Message) -> Any:
             # and that yields the same result as for a guild with only the @everyone role
             # NOTE: PrivateChannel doesn't actually have an id attribute, but we assume we are
             # receiving a DMChannel or GroupChannel which inherit from PrivateChannel and do
-            return (msg.channel if isinstance(msg.channel, PrivateChannel) else msg.author.top_role).id  # type: ignore
+            return (
+                msg.channel
+                if isinstance(msg.channel, PrivateChannel)
+                else msg.author.top_role
+            ).id  # type: ignore
 
     def __call__(self, msg: Message) -> Any:
         return self.get_key(msg)
@@ -311,7 +315,7 @@ class _Semaphore:
     def __init__(self, number: int) -> None:
         self.value: int = number
         self.loop: asyncio.AbstractEventLoop = _get_event_loop()
-        self._waiters: Deque[asyncio.Future] = deque()
+        self._waiters: deque[asyncio.Future] = deque()
 
     def __repr__(self) -> str:
         return f"<_Semaphore value={self.value} waiters={len(self._waiters)}>"

@@ -66,9 +66,7 @@
 from .errors import *
 
 if TYPE_CHECKING:
-    from typing import Concatenate, TypeGuard
-
-    from typing_extensions import ParamSpec
+    from typing import Concatenate, ParamSpec, TypeGuard
 
     from discord.message import Message
 
@@ -396,7 +394,9 @@ def __init__(
 
         # bandaid for the fact that sometimes parent can be the bot instance
         parent = kwargs.get("parent")
-        self.parent: GroupMixin | None = parent if isinstance(parent, _BaseCommand) else None  # type: ignore
+        self.parent: GroupMixin | None = (
+            parent if isinstance(parent, _BaseCommand) else None
+        )  # type: ignore
 
         self._before_invoke: Hook | None = None
         try:
@@ -1203,7 +1203,9 @@ async def can_run(self, ctx: Context) -> bool:
                 # since we have no checks, then we just return True.
                 return True
 
-            return await discord.utils.async_all(predicate(ctx) for predicate in predicates)  # type: ignore
+            return await discord.utils.async_all(
+                predicate(ctx) for predicate in predicates
+            )  # type: ignore
         finally:
             ctx.command = original
 

@@ -31,12 +31,11 @@
 import itertools
 import logging
 import os
-from collections import OrderedDict, deque
+from collections import deque
 from collections.abc import Callable, Coroutine, Sequence
 from typing import (
     TYPE_CHECKING,
     Any,
-    Deque,
     TypeVar,
     Union,
 )
@@ -290,13 +289,13 @@ def clear(self, *, views: bool = True) -> None:
         self._sounds: dict[int, SoundboardSound] = {}
 
         # LRU of max size 128
-        self._private_channels: OrderedDict[int, PrivateChannel] = OrderedDict()
+        self._private_channels: dict[int, PrivateChannel] = {}
         # extra dict to look up private channels by user id
         self._private_channels_by_user: dict[int, DMChannel] = {}
         if self.max_messages is not None:
-            self._messages: Deque[Message] | None = deque(maxlen=self.max_messages)
+            self._messages: deque[Message] | None = deque(maxlen=self.max_messages)
         else:
-            self._messages: Deque[Message] | None = None
+            self._messages: deque[Message] | None = None
 
     def process_chunk_requests(
         self, guild_id: int, nonce: str | None, members: list[Member], complete: bool
@@ -497,7 +496,7 @@ def _get_private_channel(self, channel_id: int | None) -> PrivateChannel | None:
         except KeyError:
             return None
         else:
-            self._private_channels.move_to_end(channel_id)  # type: ignore
+            self._private_channels[channel_id] = self._private_channels.pop(channel_id)  # type: ignore
             return value
 
     def _get_private_channel_by_user(self, user_id: int | None) -> DMChannel | None:
@@ -509,7 +508,8 @@ def _add_private_channel(self, channel: PrivateChannel) -> None:
         self._private_channels[channel_id] = channel
 
         if len(self._private_channels) > 128:
-            _, to_remove = self._private_channels.popitem(last=False)
+            oldest_key = next(iter(self._private_channels))
+            to_remove = self._private_channels.pop(oldest_key)
             if isinstance(to_remove, DMChannel) and to_remove.recipient:
                 self._private_channels_by_user.pop(to_remove.recipient.id, None)
 
@@ -1514,7 +1514,7 @@ def parse_guild_delete(self, data) -> None:
 
         # do a cleanup of the messages cache
         if self._messages is not None:
-            self._messages: Deque[Message] | None = deque(
+            self._messages: deque[Message] | None = deque(
                 (msg for msg in self._messages if msg.guild != guild),
                 maxlen=self.max_messages,
             )

@@ -71,19 +71,19 @@
 
 if TYPE_CHECKING:
     from discord import (
+        AppEmoji,
+        CategoryChannel,
         Client,
-        VoiceChannel,
-        TextChannel,
         ForumChannel,
+        Guild,
+        GuildEmoji,
+        Member,
+        Role,
         StageChannel,
-        CategoryChannel,
+        TextChannel,
         Thread,
-        Member,
         User,
-        Guild,
-        Role,
-        GuildEmoji,
-        AppEmoji,
+        VoiceChannel,
     )
 
 from .errors import HTTPException, InvalidArgument, InvalidData
@@ -96,32 +96,32 @@
     HAS_MSGSPEC = True
 
 __all__ = (
-    "parse_time",
-    "warn_deprecated",
+    "MISSING",
+    "as_chunks",
+    "basic_autocomplete",
     "deprecated",
-    "oauth_url",
-    "snowflake_time",
-    "time_snowflake",
+    "escape_markdown",
+    "escape_mentions",
+    "filter_params",
     "find",
+    "format_dt",
+    "generate_snowflake",
     "get",
     "get_or_fetch",
-    "sleep_until",
-    "utcnow",
-    "resolve_invite",
-    "resolve_template",
-    "remove_markdown",
-    "escape_markdown",
-    "escape_mentions",
-    "raw_mentions",
+    "oauth_url",
+    "parse_time",
     "raw_channel_mentions",
+    "raw_mentions",
     "raw_role_mentions",
-    "as_chunks",
-    "format_dt",
-    "generate_snowflake",
-    "basic_autocomplete",
-    "filter_params",
-    "MISSING",
+    "remove_markdown",
+    "resolve_invite",
+    "resolve_template",
+    "sleep_until",
+    "snowflake_time",
+    "time_snowflake",
     "users_to_csv",
+    "utcnow",
+    "warn_deprecated",
 )
 
 _log = logging.getLogger(__name__)
@@ -158,7 +158,7 @@ def __repr__(self) -> str:
 MISSING: Any = _MissingSentinel()
 
 if TYPE_CHECKING:
-    from typing_extensions import ParamSpec
+    from typing import ParamSpec
 
     from .abc import Snowflake
     from .commands.context import AutocompleteContext
@@ -207,17 +207,6 @@ def __get__(self, instance: T | None, owner: type[T]) -> Any:
             return value
 
 
-class classproperty(Generic[T_co]):
-    def __init__(self, fget: Callable[[Any], T_co]) -> None:
-        self.fget = fget
-
-    def __get__(self, instance: Any | None, owner: type[Any]) -> T_co:
-        return self.fget(owner)
-
-    def __set__(self, instance, value) -> None:
-        raise AttributeError("cannot set attribute")
-
-
 def cached_slot_property(
     name: str,
 ) -> Callable[[Callable[[T], T_co]], CachedSlotProperty[T, T_co]]:
@@ -1321,20 +1310,6 @@ def as_chunks(iterator: _Iter[T], max_size: int) -> _Iter[list[T]]:
     return _chunk(iterator, max_size)
 
 
-PY_310 = sys.version_info >= (3, 10)
-
-
-def flatten_literal_params(parameters: Iterable[Any]) -> tuple[Any, ...]:
-    params = []
-    literal_cls = type(Literal[0])
-    for p in parameters:
-        if isinstance(p, literal_cls):
-            params.extend(p.__args__)
-        else:
-            params.append(p)
-    return tuple(params)
-
-
 def normalise_optional_params(parameters: Iterable[Any]) -> tuple[Any, ...]:
     none_cls = type(None)
     return tuple(p for p in parameters if p is not none_cls) + (none_cls,)
@@ -1365,7 +1340,7 @@ def evaluate_annotation(
         is_literal = False
         args = tp.__args__
         if not hasattr(tp, "__origin__"):
-            if PY_310 and tp.__class__ is types.UnionType:  # type: ignore
+            if tp.__class__ is types.UnionType:  # type: ignore
                 converted = Union[args]  # type: ignore
                 return evaluate_annotation(converted, globals, locals, cache)
 
@@ -1377,8 +1352,6 @@ def evaluate_annotation(
             except ValueError:
                 pass
         if tp.__origin__ is Literal:
-            if not PY_310:
-                args = flatten_literal_params(tp.__args__)
             implicit_str = False
             is_literal = True
 

@@ -28,7 +28,7 @@
 from typing import TYPE_CHECKING, Generic, TypeVar
 
 if TYPE_CHECKING:
-    from typing_extensions import ParamSpec
+    from typing import ParamSpec
 
     from discord import abc
     from discord.client import Client

@@ -52,7 +52,7 @@
     import nacl.utils
 
 if TYPE_CHECKING:
-    from typing_extensions import ParamSpec
+    from typing import ParamSpec
 
     from discord import abc
     from discord.client import Client