From 270fa5f2e0d7eca396f9df0bcc9ad0e643c2fe9a Mon Sep 17 00:00:00 2001 From: Rapptz Date: Fri, 7 Jul 2023 00:09:10 -0400 Subject: [PATCH] [commands] Fix displayed_default for callables and None values --- discord/ext/commands/core.py | 2 +- discord/ext/commands/parameters.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/discord/ext/commands/core.py b/discord/ext/commands/core.py index 045f63dc6..efd7b09d2 100644 --- a/discord/ext/commands/core.py +++ b/discord/ext/commands/core.py @@ -1209,7 +1209,7 @@ class Command(_BaseCommand, Generic[CogT, P, T]): if not param.required: # We don't want None or '' to trigger the [name=value] case and instead it should # do [name] since [name=None] or [name=] are not exactly useful for the user. - if param.default is not None and param.displayed_default: + if param.displayed_default: result.append( f'[{name}={param.displayed_default}]' if not greedy else f'[{name}={param.displayed_default}]...' ) diff --git a/discord/ext/commands/parameters.py b/discord/ext/commands/parameters.py index 181653bdc..d8023e202 100644 --- a/discord/ext/commands/parameters.py +++ b/discord/ext/commands/parameters.py @@ -175,7 +175,13 @@ class Parameter(inspect.Parameter): if self._displayed_default is not empty: return self._displayed_default - return None if self.required else str(self.default) + if self.required: + return None + + if callable(self.default) or self.default is None: + return None + + return str(self.default) @property def displayed_name(self) -> Optional[str]: