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

[commands] Add support for types.Union to Greedy

Browse Source
This commit is contained in:
Josh
2022-08-22 08:26:32 +10:00
committed by GitHub
parent 6a6e261523
commit 01bb7ecb79
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,7 @@ from typing import (
Union, Union,
runtime_checkable, runtime_checkable,
) )
import types
import discord import discord
@@ -1021,8 +1022,11 @@ class Greedy(List[T]):
raise TypeError('Greedy[...] only takes a single argument') raise TypeError('Greedy[...] only takes a single argument')
converter = params[0] converter = params[0]
origin = getattr(converter, '__origin__', None)
args = getattr(converter, '__args__', ()) args = getattr(converter, '__args__', ())
if discord.utils.PY_310 and converter.__class__ is types.UnionType: # type: ignore
converter = Union[args] # type: ignore
origin = getattr(converter, '__origin__', None)
if not (callable(converter) or isinstance(converter, Converter) or origin is not None): if not (callable(converter) or isinstance(converter, Converter) or origin is not None):
raise TypeError('Greedy[...] expects a type or a Converter instance.') raise TypeError('Greedy[...] expects a type or a Converter instance.')