fix(converter): allow Greedy[...] to accept union types#1482
Open
devbutlazy wants to merge 2 commits intoDisnakeDev:masterfrom
Open
fix(converter): allow Greedy[...] to accept union types#1482devbutlazy wants to merge 2 commits intoDisnakeDev:masterfrom
devbutlazy wants to merge 2 commits intoDisnakeDev:masterfrom
Conversation
shiftinv
reviewed
Feb 16, 2026
Member
shiftinv
left a comment
There was a problem hiding this comment.
Thank you for the PR! Just two small comments; for the most part this looks good to me, and seems to work as expected.
|
|
||
| if origin is Union and type(None) in args: | ||
| msg = f"Greedy[{converter!r}] is invalid." | ||
| if origin in (Union, types.UnionType) and any(arg is type(None) for arg in args): |
Member
There was a problem hiding this comment.
Is there a reason to change the latter part of this from type(None) in args to any(...)?
| @@ -0,0 +1 @@ | |||
| Fix Greedy[...] to accept union types (e.g., Member | Object) in commands. | |||
Member
There was a problem hiding this comment.
Suggested change
| Fix Greedy[...] to accept union types (e.g., Member | Object) in commands. | |
| Fix ``Greedy[...]`` to accept union types (e.g. ``Member | Object``) in commands. |
just a minor nit
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fix #1421 =>
commands.Greedy[...]to correctly support Python 3.10+ union types (PEP 604 A | B) and typing.Union.Previously, passing a union type like
commands.Greedy[disnake.Member | disnake.Object]would raise:This PR updates
Greedy.__class_getitem__to:typing.get_originandtyping.get_argsGreedy[str]andGreedy[None];Greedy[Optional[T]];Greedy[Greedy[T]]getattr(converter, "__name__", repr(converter))for safe error messagesNow,
Greedy[disnake.Member | disnake.Object]works as expected, allowing commands to greedily consume multiple valid converter types.Checklist
uv run nox -s lintuv run nox -s pyright