♻️ move maybe_coroutine to private

Author: Paillat-dev

discord/commands/core.py

@@ -68,8 +68,8 @@
 from ..role import Role
 from ..threads import Thread
 from ..user import User
-from ..utils import MISSING, find, maybe_coroutine, utcnow
-from ..utils.private import warn_deprecated, async_all
+from ..utils import MISSING, find, utcnow
+from ..utils.private import warn_deprecated, async_all, maybe_coroutine
 from .context import ApplicationContext, AutocompleteContext
 from .options import Option, OptionChoice
 

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.maybe_coroutine(prefix, self, message)
+            ret = await discord.utils.private.maybe_coroutine(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.maybe_coroutine(local_check, ctx)
+                    ret = await discord.utils.private.maybe_coroutine(local_check, ctx)
                     if not ret:
                         return False
 

discord/ext/commands/flags.py

@@ -32,8 +32,8 @@
 from typing import TYPE_CHECKING, Any, Iterator, Literal, Pattern, TypeVar, Union
 
 from discord import utils
-from ...utils import MISSING, Undefined, maybe_coroutine
-from ...utils.private import resolve_annotation
+from ...utils import MISSING, Undefined
+from ...utils.private import resolve_annotation, maybe_coroutine
 
 from .converter import run_converters
 from .errors import (

discord/ext/commands/help.py

@@ -32,7 +32,7 @@
 from typing import TYPE_CHECKING, Any
 
 from ... import utils
-from ...utils.private import string_width
+from ...utils.private import string_width, maybe_coroutine
 
 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 utils.maybe_coroutine(self.command_not_found, self.remove_mentions(keys[0]))
+            string = await maybe_coroutine(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 utils.maybe_coroutine(self.subcommand_not_found, cmd, self.remove_mentions(key))
+                string = await maybe_coroutine(self.subcommand_not_found, cmd, self.remove_mentions(key))
                 return await self.send_error_message(string)
             else:
                 if found is None:
-                    string = await utils.maybe_coroutine(self.subcommand_not_found, cmd, self.remove_mentions(key))
+                    string = await maybe_coroutine(self.subcommand_not_found, cmd, self.remove_mentions(key))
                     return await self.send_error_message(string)
                 cmd = found
 

discord/iterators.py

@@ -41,7 +41,8 @@
 from .audit_logs import AuditLogEntry
 from .errors import NoMoreItems
 from .object import Object
-from .utils import generate_snowflake, maybe_coroutine, snowflake_time
+from .utils import generate_snowflake, snowflake_time
+from .utils.private import maybe_coroutine
 
 __all__ = (
     "ReactionIterator",

discord/utils/__init__.py

@@ -32,7 +32,6 @@
 import json
 import re
 from bisect import bisect_left
-from inspect import isawaitable
 from inspect import signature as _signature
 from typing import (
     TYPE_CHECKING,
@@ -304,14 +303,6 @@ def _to_json(obj: Any) -> str:
     _from_json = json.loads
 
 
-async def maybe_coroutine(f, *args, **kwargs):
-    value = f(*args, **kwargs)
-    if isawaitable(value):
-        return await value
-    else:
-        return value
-
-
 async def sane_wait_for(futures, *, timeout):
     ensured = [asyncio.ensure_future(fut) for fut in futures]
     done, pending = await asyncio.wait(ensured, timeout=timeout, return_when=asyncio.ALL_COMPLETED)

discord/utils/private.py

@@ -392,3 +392,11 @@ async def async_all(gen: Iterable[Any]) -> bool:
         if not elem:
             return False
     return True
+
+
+async def maybe_coroutine(f, *args, **kwargs):
+    value = f(*args, **kwargs)
+    if isawaitable(value):
+        return await value
+    else:
+        return value

tests/test_utils.py

@@ -35,7 +35,6 @@
     find,
     generate_snowflake,
     get,
-    maybe_coroutine,
     snowflake_time,
     utcnow,
 )