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

[commands] Fix Generics causing other typing converters to fail

Browse Source
This commit is contained in:
Rapptz 2021-04-30 01:23:56 -04:00
parent 7b8db49efe
commit 58274eafbc
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -905,6 +905,13 @@ def get_converter(param: inspect.Parameter) -> Any:
return converter return converter
_GenericAlias = type(List[T])
def is_generic_type(tp: Any, *, _GenericAlias: Type = _GenericAlias) -> bool:
return isinstance(tp, type) and issubclass(tp, Generic) or isinstance(tp, _GenericAlias) # type: ignore
CONVERTER_MAPPING: Dict[Type[Any], Any] = { CONVERTER_MAPPING: Dict[Type[Any], Any] = {
discord.Object: ObjectConverter, discord.Object: ObjectConverter,
discord.Member: MemberConverter, discord.Member: MemberConverter,
@ -996,9 +1003,6 @@ async def run_converters(ctx: Context, converter, argument: str, param: inspect.
""" """
origin = getattr(converter, '__origin__', None) origin = getattr(converter, '__origin__', None)
if origin is not None and issubclass(converter, Generic): # type: ignore
converter = origin
if origin is Union: if origin is Union:
errors = [] errors = []
_NoneType = type(None) _NoneType = type(None)
@ -1045,4 +1049,11 @@ async def run_converters(ctx: Context, converter, argument: str, param: inspect.
# if we're here, then we failed to match all the literals # if we're here, then we failed to match all the literals
raise BadLiteralArgument(param, literal_args, errors) raise BadLiteralArgument(param, literal_args, errors)
# This must be the last if-clause in the chain of origin checking
# Nearly every type is a generic type within the typing library
# So care must be taken to make sure a more specialised origin handle
# isn't overwritten by the widest if clause
if origin is not None and is_generic_type(converter):
converter = origin
return await _actual_conversion(ctx, converter, argument, param) return await _actual_conversion(ctx, converter, argument, param)