diff options
| author | Sebastian Law <[email protected]> | 2020-06-28 00:54:34 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-06-28 03:54:34 -0400 |
| commit | 7a07644de3dad9defe60d44cca7211b7b7f84134 (patch) | |
| tree | 63f57954064dbc3ee4ec5ead1f0f83ad5f93af61 /discord/ext | |
| parent | [tasks] Fix issue with default error handler in class context (diff) | |
| download | discord.py-7a07644de3dad9defe60d44cca7211b7b7f84134.tar.xz discord.py-7a07644de3dad9defe60d44cca7211b7b7f84134.zip | |
[commands] Raise TypeError when Optional is used with Greedy converter
Diffstat (limited to 'discord/ext')
| -rw-r--r-- | discord/ext/commands/converter.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/discord/ext/commands/converter.py b/discord/ext/commands/converter.py index 3d706bf8..123b6699 100644 --- a/discord/ext/commands/converter.py +++ b/discord/ext/commands/converter.py @@ -26,6 +26,7 @@ DEALINGS IN THE SOFTWARE. import re import inspect +import typing import discord @@ -555,6 +556,9 @@ class _Greedy: if converter is str or converter is type(None) or converter is _Greedy: raise TypeError('Greedy[%s] is invalid.' % converter.__name__) + if getattr(converter, '__origin__', None) is typing.Union and type(None) in converter.__args__: + raise TypeError('Greedy[%r] is invalid.' % converter) + return self.__class__(converter=converter) Greedy = _Greedy() |