From e4de25eaab902666749e30b79c60e3fe23842201 Mon Sep 17 00:00:00 2001 From: Rapptz Date: Sat, 6 Apr 2019 19:29:21 -0400 Subject: [PATCH] [commands] Raise BadArgument in ColourConverter when using from_hsv/rgb Fixes #2043 --- discord/ext/commands/converter.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/discord/ext/commands/converter.py b/discord/ext/commands/converter.py index 600f4be92..8676329c5 100644 --- a/discord/ext/commands/converter.py +++ b/discord/ext/commands/converter.py @@ -298,8 +298,9 @@ class ColourConverter(Converter): raise BadArgument('Colour "{}" is invalid.'.format(arg)) return discord.Colour(value=value) except ValueError: - method = getattr(discord.Colour, arg.replace(' ', '_'), None) - if method is None or not inspect.ismethod(method): + arg = arg.replace(' ', '_') + 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)) return method()