♻️ replace custom cached_property implementation with functools.cached_property

Author: Paillat-dev

discord/audit_logs.py

@@ -26,6 +26,7 @@
 from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any, Callable, ClassVar, Generator, TypeVar
+from functools import cached_property
 
 from .utils.private import get_as_snowflake
 from . import enums, utils
@@ -569,12 +570,12 @@ def _get_member(self, user_id: int) -> Member | User | None:
     def __repr__(self) -> str:
         return f"<AuditLogEntry id={self.id} action={self.action} user={self.user!r}>"
 
-    @utils.cached_property
+    @cached_property
     def created_at(self) -> datetime.datetime:
         """Returns the entry's creation time in UTC."""
         return utils.snowflake_time(self.id)
 
-    @utils.cached_property
+    @cached_property
     def target(
         self,
     ) -> (
@@ -598,24 +599,24 @@ def target(
         else:
             return converter(self._target_id)
 
-    @utils.cached_property
+    @property
     def category(self) -> enums.AuditLogActionCategory:
         """The category of the action, if applicable."""
         return self.action.category
 
-    @utils.cached_property
+    @cached_property
     def changes(self) -> AuditLogChanges:
         """The list of changes this entry has."""
         obj = AuditLogChanges(self, self._changes, state=self._state)
         del self._changes
         return obj
 
-    @utils.cached_property
+    @property
     def before(self) -> AuditLogDiff:
         """The target's prior state."""
         return self.changes.before
 
-    @utils.cached_property
+    @property
     def after(self) -> AuditLogDiff:
         """The target's subsequent state."""
         return self.changes.after

discord/commands/context.py

@@ -53,7 +53,6 @@
 
     from typing import Callable, Awaitable
 
-from ..utils import cached_property
 from ..utils.private import copy_doc
 
 T = TypeVar("T")
@@ -137,68 +136,68 @@ async def invoke(
         """
         return await command(self, *args, **kwargs)
 
-    @cached_property
+    @property
     def channel(self) -> InteractionChannel | None:
         """Union[:class:`abc.GuildChannel`, :class:`PartialMessageable`, :class:`Thread`]:
         Returns the channel associated with this context's command. Shorthand for :attr:`.Interaction.channel`.
         """
         return self.interaction.channel
 
-    @cached_property
+    @property
     def channel_id(self) -> int | None:
         """Returns the ID of the channel associated with this context's command.
         Shorthand for :attr:`.Interaction.channel_id`.
         """
         return self.interaction.channel_id
 
-    @cached_property
+    @property
     def guild(self) -> Guild | None:
         """Returns the guild associated with this context's command.
         Shorthand for :attr:`.Interaction.guild`.
         """
         return self.interaction.guild
 
-    @cached_property
+    @property
     def guild_id(self) -> int | None:
         """Returns the ID of the guild associated with this context's command.
         Shorthand for :attr:`.Interaction.guild_id`.
         """
         return self.interaction.guild_id
 
-    @cached_property
+    @property
     def locale(self) -> str | None:
         """Returns the locale of the guild associated with this context's command.
         Shorthand for :attr:`.Interaction.locale`.
         """
         return self.interaction.locale
 
-    @cached_property
+    @property
     def guild_locale(self) -> str | None:
         """Returns the locale of the guild associated with this context's command.
         Shorthand for :attr:`.Interaction.guild_locale`.
         """
         return self.interaction.guild_locale
 
-    @cached_property
+    @property
     def app_permissions(self) -> Permissions:
         return self.interaction.app_permissions
 
-    @cached_property
+    @property
     def me(self) -> Member | ClientUser | None:
         """Union[:class:`.Member`, :class:`.ClientUser`]:
         Similar to :attr:`.Guild.me` except it may return the :class:`.ClientUser` in private message
         message contexts, or when :meth:`Intents.guilds` is absent.
         """
         return self.interaction.guild.me if self.interaction.guild is not None else self.bot.user
 
-    @cached_property
+    @property
     def message(self) -> Message | None:
         """Returns the message sent with this context's command.
         Shorthand for :attr:`.Interaction.message`, if applicable.
         """
         return self.interaction.message
 
-    @cached_property
+    @property
     def user(self) -> Member | User:
         """Returns the user that sent this context's command.
         Shorthand for :attr:`.Interaction.user`.
@@ -217,7 +216,7 @@ def voice_client(self) -> VoiceClient | None:
 
         return self.interaction.guild.voice_client
 
-    @cached_property
+    @property
     def response(self) -> InteractionResponse:
         """Returns the response object associated with this context's command.
         Shorthand for :attr:`.Interaction.response`.

discord/ext/commands/context.py

@@ -282,28 +282,28 @@ def cog(self) -> Cog | None:
             return None
         return self.command.cog
 
-    @discord.utils.cached_property
+    @property
     def guild(self) -> Guild | None:
         """Returns the guild associated with this context's command.
         None if not available.
         """
         return self.message.guild
 
-    @discord.utils.cached_property
+    @property
     def channel(self) -> MessageableChannel:
         """Returns the channel associated with this context's command.
         Shorthand for :attr:`.Message.channel`.
         """
         return self.message.channel
 
-    @discord.utils.cached_property
+    @property
     def author(self) -> User | Member:
         """Union[:class:`~discord.User`, :class:`.Member`]:
         Returns the author associated with this context's command. Shorthand for :attr:`.Message.author`
         """
         return self.message.author
 
-    @discord.utils.cached_property
+    @property
     def me(self) -> Member | ClientUser:
         """Union[:class:`.Member`, :class:`.ClientUser`]:
         Similar to :attr:`.Guild.me` except it may return the :class:`.ClientUser` in private message

discord/onboarding.py

@@ -25,12 +25,13 @@
 from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
+from functools import cached_property
 
 from discord import utils
 
 from .enums import OnboardingMode, PromptType, try_enum
 from .partial_emoji import PartialEmoji
-from .utils import MISSING, cached_property, generate_snowflake, find
+from .utils import MISSING, generate_snowflake, find
 
 if TYPE_CHECKING:
     from .abc import Snowflake

discord/poll.py

@@ -26,6 +26,7 @@
 
 import datetime
 from typing import TYPE_CHECKING, Any
+from functools import cached_property
 
 from .utils.private import parse_time
 from . import utils
@@ -342,7 +343,7 @@ def __init__(
         self._expiry = None
         self._message = None
 
-    @utils.cached_property
+    @cached_property
     def expiry(self) -> datetime.datetime | None:
         """An aware datetime object that specifies the date and time in UTC when the poll will end."""
         return parse_time(self._expiry)

discord/utils/__init__.py

@@ -26,7 +26,6 @@
 from __future__ import annotations
 
 from typing import (
-    TYPE_CHECKING,
     Any,
     AsyncIterator,
     Iterator,
@@ -79,42 +78,6 @@
 )
 
 
-class _cached_property:
-    def __init__(self, function):
-        self.function = function
-        self.__doc__ = getattr(function, "__doc__")
-
-    def __get__(self, instance, owner):
-        if instance is None:
-            return self
-
-        value = self.function(instance)
-        setattr(instance, self.function.__name__, value)
-
-        return value
-
-
-if TYPE_CHECKING:
-    from typing_extensions import ParamSpec
-
-    class _RequestLike(Protocol):
-        headers: Mapping[str, Any]
-
-    cached_property = property
-
-    P = ParamSpec("P")
-
-else:
-    cached_property = _cached_property
-    AutocompleteContext = Any
-    OptionChoice = Any
-
-
-T = TypeVar("T")
-T_co = TypeVar("T_co", covariant=True)
-_Iter = Union[Iterator[T], AsyncIterator[T]]
-
-
 async def get_or_fetch(obj, attr: str, id: int, *, default: Any = MISSING) -> Any:
     """|coro|
 

tests/test_utils.py

@@ -30,7 +30,6 @@
 
 from discord.utils import (
     MISSING,
-    _cached_property,
     find,
     generate_snowflake,
     snowflake_time,
@@ -73,23 +72,6 @@ def test_temporary():
 #     assert not MISSING
 #     assert repr(MISSING) == '...'
 #
-#
-# def test_cached_property() -> None:
-#     class Test:
-#         def __init__(self, x: int):
-#             self.x = x
-#
-#         @_cached_property
-#         def foo(self) -> int:
-#             self.x += 1
-#             return self.x
-#
-#     t = Test(0)
-#     assert isinstance(_cached_property.__get__(_cached_property(None), None, None), _cached_property)
-#     assert t.foo == 1
-#     assert t.foo == 1
-#
-#
 # def test_find_get() -> None:
 #     class Obj:
 #         def __init__(self, value: int):