matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

[commands] raise ConversionError on Converter error

Browse Source 
This assumes that a Converter class raising non-CommandError
is a programmer error. Makes this type of error easier to
disambiguate from a generic BadArgument.
This commit is contained in:
khazhyk
2018-07-15 19:39:33 -07:00
committed by Rapptz
parent 87d9eefdef
commit 2321ae8d97
3 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,7 +212,7 @@ class Command:
self.instance = instance
return self
async def do_conversion(self, ctx, converter, argument):
async def do_conversion(self, ctx, converter, argument, param):
if converter is bool:
return _convert_to_bool(argument)
@@ -224,21 +224,36 @@ class Command:
if module.startswith('discord.') and not module.endswith('converter'):
converter = getattr(converters, converter.__name__ + 'Converter')
if inspect.isclass(converter):
if issubclass(converter, converters.Converter):
instance = converter()
ret = await instance.convert(ctx, argument)
return ret
else:
method = getattr(converter, 'convert', None)
if method is not None and inspect.ismethod(method):
ret = await method(ctx, argument)
try:
if inspect.isclass(converter):
if issubclass(converter, converters.Converter):
instance = converter()
ret = await instance.convert(ctx, argument)
return ret
elif isinstance(converter, converters.Converter):
ret = await converter.convert(ctx, argument)
return ret
else:
method = getattr(converter, 'convert', None)
if method is not None and inspect.ismethod(method):
ret = await method(ctx, argument)
return ret
elif isinstance(converter, converters.Converter):
ret = await converter.convert(ctx, argument)
return ret
except CommandError as e:
raise e
except Exception as e:
raise ConversionError(converter) from e
return converter(argument)
try:
return converter(argument)
except CommandError as e:
raise e
except Exception as e:
try:
name = converter.__name__
except AttributeError:
name = converter.__class__.__name__
raise BadArgument('Converting to "{}" failed for parameter "{}".'.format(name, param.name)) from e
def _get_converter(self, param):
converter = param.annotation
@@ -268,17 +283,7 @@ class Command:
else:
argument = quoted_word(view)
try:
return (await self.do_conversion(ctx, converter, argument))
except CommandError as e:
raise e
except Exception as e:
try:
name = converter.__name__
except AttributeError:
name = converter.__class__.__name__
raise BadArgument('Converting to "{}" failed for parameter "{}".'.format(name, param.name)) from e
return (await self.do_conversion(ctx, converter, argument, param))
@property
def clean_params(self):