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

[commands] Raise TypeError when Optional is used with Greedy converter

Browse Source
This commit is contained in:
Sebastian Law 2020-06-28 00:54:34 -07:00 committed by GitHub
parent 6b5be39cd2
commit 7a07644de3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@ DEALINGS IN THE SOFTWARE.
import re import re
import inspect import inspect
import typing
import discord import discord
@ -555,6 +556,9 @@ class _Greedy:
if converter is str or converter is type(None) or converter is _Greedy: if converter is str or converter is type(None) or converter is _Greedy:
raise TypeError('Greedy[%s] is invalid.' % converter.__name__) 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) return self.__class__(converter=converter)
Greedy = _Greedy() Greedy = _Greedy()

4
docs/ext/commands/commands.rst
View File

@ -552,8 +552,8 @@ This command can be invoked any of the following ways:
unintended parsing ambiguities in your code. One technique would be to clamp down the expected syntaxes unintended parsing ambiguities in your code. One technique would be to clamp down the expected syntaxes
allowed through custom converters or reordering the parameters to minimise clashes. allowed through custom converters or reordering the parameters to minimise clashes.
To help aid with some parsing ambiguities, :class:`str`, ``None`` and :data:`~ext.commands.Greedy` are To help aid with some parsing ambiguities, :class:`str`, ``None``, :data:`typing.Optional` and
forbidden as parameters for the :data:`~ext.commands.Greedy` converter. :data:`~ext.commands.Greedy` are forbidden as parameters for the :data:`~ext.commands.Greedy` converter.
.. _ext_commands_error_handler: .. _ext_commands_error_handler: