Update models's fields' _Choices type #2476
Open
+110
−3
Conversation
This file contains 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
sobolevn
reviewed
Jan 9, 2025
django-stubs/utils/choices.pyi
Outdated
| from typing import Any, Protocol, TypeVar, type_check_only | ||
|
|
||
| from typing_extensions import TypeAlias | ||
|
|
||
| _Choice: TypeAlias = tuple[Any, Any] | ||
| _ChoiceNamedGroup: TypeAlias = tuple[str, Iterable[_Choice]] | ||
| _Choices: TypeAlias = Iterable[_Choice | _ChoiceNamedGroup] | ||
| _ChoicesMapping: TypeAlias = Mapping[Any, Any] | Mapping[str, Mapping[Any, Any]] # noqa: PYI047 |
There was a problem hiding this comment.
Isn't it just Mapping[Any, Any]?
| @@ -0,0 +1,159 @@ | |||
| - case: db_models_fields_choices | |||
There was a problem hiding this comment.
The tests/assert_type/db/models/fields/test_choices.py test is enough, no need to duplicate it. Can you please test invalid types here? At least one.
There was a problem hiding this comment.
I pushed an update now, was this what you had in mind?
stianjensen
force-pushed
the
django5-choices
branch
from
8f89556 to
639c727
Compare
Django 5 allows model field choices to be callables, mappings or subclasses of models.Choices. This commit introduces these options in the stubs. Co-Authored-By: Stian Jensen <me@stianj.com>
stianjensen
force-pushed
the
django5-choices
branch
from
c104ea7 to
3531bd4
Compare
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.
Django 5 allows model field choices to be callables, mappings or subclasses of models.Choices. This commit introduces these options in the stubs.
Continuation of #2368, to fix a merge conflict, avoid issues with importing
Tupleinstead of usingtuple, and avoid unnecessary formatting changes.