mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-04-19 15:36:02 +00:00
Code Issues Projects Releases Wiki Activity

[commands] Revert conversion code back to how it was originally

Browse Source
This commit is contained in:
Rapptz 2021-04-05 23:24:47 -04:00
parent 0efb720cec
commit ee5bb07c02
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
discord/ext/commands/core.py
View File

@ -444,14 +444,13 @@ class Command(_BaseCommand):
try:
if inspect.isclass(converter):
if inspect.ismethod(getattr(converter, 'convert', None)):
if converter.convert.__self__ is converter:
# class method
func = converter.convert
else:
# instance method
func = converter().convert
return await func.convert(ctx, argument)
if issubclass(converter, converters.Converter):
instance = converter()
return await instance.convert(ctx, argument)
else:
method = getattr(converter, 'convert', None)
if method is not None and inspect.ismethod(method):
return await method(ctx, argument)
elif isinstance(converter, converters.Converter):
return await converter.convert(ctx, argument)
except CommandError: