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

[commands] Raise BadArgument in ColourConverter when using from_hsv/rgb

Browse Source 
Fixes #2043
This commit is contained in:
Rapptz 2019-04-06 19:29:21 -04:00
parent 24d3a5a48d
commit e4de25eaab
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
discord/ext/commands/converter.py
View File

@ -298,8 +298,9 @@ class ColourConverter(Converter):
raise BadArgument('Colour "{}" is invalid.'.format(arg)) raise BadArgument('Colour "{}" is invalid.'.format(arg))
return discord.Colour(value=value) return discord.Colour(value=value)
except ValueError: except ValueError:
method = getattr(discord.Colour, arg.replace(' ', '_'), None) arg = arg.replace(' ', '_')
if method is None or not inspect.ismethod(method): method = getattr(discord.Colour, arg, None)
if arg.startswith('from_') or method is None or not inspect.ismethod(method):
raise BadArgument('Colour "{}" is invalid.'.format(arg)) raise BadArgument('Colour "{}" is invalid.'.format(arg))
return method() return method()