mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-09-03 08:35:53 +00:00
Code Issues Projects Releases Wiki Activity

[commands] Change FlagConverter to always raise BadFlagArgument

Browse Source
This commit is contained in:
z03h
2022-05-16 12:31:18 -07:00
committed by GitHub
parent 7267d18d9e
commit 9450a8e972
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
discord/ext/commands/flags.py
View File

@ -33,7 +33,7 @@ from typing import TYPE_CHECKING, Any, Dict, Iterator, List, Literal, Optional,
from discord.utils import MISSING, maybe_coroutine, resolve_annotation
from .converter import run_converters
from .errors import BadFlagArgument, CommandError, MissingFlagArgument, MissingRequiredFlag, TooManyFlags
from .errors import BadFlagArgument, MissingFlagArgument, MissingRequiredFlag, TooManyFlags
from .view import StringView
__all__ = (
@ -368,10 +368,8 @@ async def tuple_convert_all(ctx: Context[BotT], argument: str, flag: Flag, conve
try:
converted = await run_converters(ctx, converter, word, param)
except CommandError:
raise
except Exception as e:
raise BadFlagArgument(flag) from e
raise BadFlagArgument(flag, word, e) from e
else:
results.append(converted)
@ -393,15 +391,13 @@ async def tuple_convert_flag(ctx: Context[BotT], argument: str, flag: Flag, conv
try:
converted = await run_converters(ctx, converter, word, param)
except CommandError:
raise
except Exception as e:
raise BadFlagArgument(flag) from e
raise BadFlagArgument(flag, word, e) from e
else:
results.append(converted)
if len(results) != len(converters):
raise BadFlagArgument(flag)
raise MissingFlagArgument(flag)
return tuple(results)
@ -433,10 +429,8 @@ async def convert_flag(ctx: Context[BotT], argument: str, flag: Flag, annotation
try:
return await run_converters(ctx, annotation, argument, param)
except CommandError:
raise
except Exception as e:
raise BadFlagArgument(flag) from e
raise BadFlagArgument(flag, argument, e) from e
class FlagConverter(metaclass=FlagsMeta):
@ -559,8 +553,6 @@ class FlagConverter(metaclass=FlagsMeta):
Parameters
----------
cls: Type[:class:`FlagConverter`]
The flag converter class.
ctx: :class:`Context`
The invocation context.
argument: :class:`str`
@ -570,8 +562,6 @@ class FlagConverter(metaclass=FlagsMeta):
--------
FlagError
A flag related parsing error.
CommandError
A command related error.
Returns
--------