♻️ rename maybe_coroutine to maybe_awaitable

Author: Paillat-dev

discord/commands/core.py

@@ -69,7 +69,7 @@
 from ..threads import Thread
 from ..user import User
 from ..utils import MISSING, find, utcnow
-from ..utils.private import warn_deprecated, async_all, maybe_coroutine
+from ..utils.private import warn_deprecated, async_all, maybe_awaitable
 from .context import ApplicationContext, AutocompleteContext
 from .options import Option, OptionChoice
 
@@ -433,7 +433,7 @@ async def can_run(self, ctx: ApplicationContext) -> bool:
         if cog is not None:
             local_check = cog._get_overridden_method(cog.cog_check)
             if local_check is not None:
-                ret = await maybe_coroutine(local_check, ctx)
+                ret = await maybe_awaitable(local_check, ctx)
                 if not ret:
                     return False
 

discord/ext/commands/bot.py

@@ -224,7 +224,7 @@ async def get_prefix(self, message: Message) -> list[str] | str:
         """
         prefix = ret = self.command_prefix
         if callable(prefix):
-            ret = await discord.utils.private.maybe_coroutine(prefix, self, message)
+            ret = await discord.utils.private.maybe_awaitable(prefix, self, message)
 
         if not isinstance(ret, str):
             try:

discord/ext/commands/core.py

@@ -1147,7 +1147,7 @@ async def can_run(self, ctx: Context) -> bool:
             if cog is not None:
                 local_check = Cog._get_overridden_method(cog.cog_check)
                 if local_check is not None:
-                    ret = await discord.utils.private.maybe_coroutine(local_check, ctx)
+                    ret = await discord.utils.private.maybe_awaitable(local_check, ctx)
                     if not ret:
                         return False
 

discord/ext/commands/flags.py

@@ -33,7 +33,7 @@
 
 from discord import utils
 from ...utils import MISSING, Undefined
-from ...utils.private import resolve_annotation, maybe_coroutine
+from ...utils.private import resolve_annotation, maybe_awaitable
 
 from .converter import run_converters
 from .errors import (
@@ -486,7 +486,7 @@ async def _construct_default(cls: type[F], ctx: Context) -> F:
         flags = cls.__commands_flags__
         for flag in flags.values():
             if callable(flag.default):
-                default = await maybe_coroutine(flag.default, ctx)
+                default = await maybe_awaitable(flag.default, ctx)
                 setattr(self, flag.attribute, default)
             else:
                 setattr(self, flag.attribute, flag.default)
@@ -585,7 +585,7 @@ async def convert(cls: type[F], ctx: Context, argument: str) -> F:
                     raise MissingRequiredFlag(flag)
                 else:
                     if callable(flag.default):
-                        default = await maybe_coroutine(flag.default, ctx)
+                        default = await maybe_awaitable(flag.default, ctx)
                         setattr(self, flag.attribute, default)
                     else:
                         setattr(self, flag.attribute, flag.default)

discord/ext/commands/help.py

@@ -32,7 +32,7 @@
 from typing import TYPE_CHECKING, Any
 
 from ... import utils
-from ...utils.private import string_width, maybe_coroutine
+from ...utils.private import string_width, maybe_awaitable
 
 from .core import Command, Group
 from .errors import CommandError
@@ -868,18 +868,18 @@ async def command_callback(self, ctx, *, command=None):
         keys = command.split(" ")
         cmd = bot.all_commands.get(keys[0])
         if cmd is None:
-            string = await maybe_coroutine(self.command_not_found, self.remove_mentions(keys[0]))
+            string = await maybe_awaitable(self.command_not_found, self.remove_mentions(keys[0]))
             return await self.send_error_message(string)
 
         for key in keys[1:]:
             try:
                 found = cmd.all_commands.get(key)
             except AttributeError:
-                string = await maybe_coroutine(self.subcommand_not_found, cmd, self.remove_mentions(key))
+                string = await maybe_awaitable(self.subcommand_not_found, cmd, self.remove_mentions(key))
                 return await self.send_error_message(string)
             else:
                 if found is None:
-                    string = await maybe_coroutine(self.subcommand_not_found, cmd, self.remove_mentions(key))
+                    string = await maybe_awaitable(self.subcommand_not_found, cmd, self.remove_mentions(key))
                     return await self.send_error_message(string)
                 cmd = found
 

discord/iterators.py

@@ -42,7 +42,7 @@
 from .errors import NoMoreItems
 from .object import Object
 from .utils import generate_snowflake, snowflake_time
-from .utils.private import maybe_coroutine
+from .utils.private import maybe_awaitable
 
 __all__ = (
     "ReactionIterator",
@@ -106,7 +106,7 @@ async def find(self, predicate: _Func[T, bool]) -> T | None:
             except NoMoreItems:
                 return None
 
-            ret = await maybe_coroutine(predicate, elem)
+            ret = await maybe_awaitable(predicate, elem)
             if ret:
                 return elem
 
@@ -164,7 +164,7 @@ def __init__(self, iterator, func):
     async def next(self) -> T:
         # this raises NoMoreItems and will propagate appropriately
         item = await self.iterator.next()
-        return await maybe_coroutine(self.func, item)
+        return await maybe_awaitable(self.func, item)
 
 
 class _FilteredAsyncIterator(_AsyncIterator[T]):
@@ -182,7 +182,7 @@ async def next(self) -> T:
         while True:
             # propagate NoMoreItems similar to _MappedAsyncIterator
             item = await getter()
-            ret = await maybe_coroutine(pred, item)
+            ret = await maybe_awaitable(pred, item)
             if ret:
                 return item
 

discord/utils/private.py

@@ -22,6 +22,8 @@
     ForwardRef,
     Union,
     Coroutine,
+    Awaitable,
+    reveal_type,
 )
 
 from ..errors import InvalidArgument, HTTPException
@@ -32,6 +34,9 @@
 
 _IS_ASCII = re.compile(r"^[\x00-\x7f]+$")
 
+P = ParamSpec("P")
+T = TypeVar("T")
+
 
 def resolve_invite(invite: Invite | str) -> str:
     """
@@ -223,10 +228,6 @@ def warn_deprecated(
     warnings.simplefilter("default", DeprecationWarning)  # reset filter
 
 
-P = ParamSpec("P")
-T = TypeVar("T")
-
-
 def deprecated(
     instead: str | None = None,
     since: str | None = None,
@@ -394,9 +395,9 @@ async def async_all(gen: Iterable[Any]) -> bool:
     return True
 
 
-async def maybe_coroutine(f, *args, **kwargs):
+async def maybe_awaitable(f: Callable[P, T | Awaitable[T]], *args: P.args, **kwargs: P.kwargs) -> T:
     value = f(*args, **kwargs)
     if isawaitable(value):
+        reveal_type(f)
         return await value
-    else:
-        return value
+    return value