Improve ModelAdmin and decorator hints and attributes, add tests #1292
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
intgr
commented
Dec 13, 2022
| _Model = TypeVar("_Model", bound=Model) | ||
| _ModelAdmin = TypeVar("_ModelAdmin", bound=ModelAdmin) | ||
| _Request = TypeVar("_Request", bound=HttpRequest) | ||
| _QuerySet = TypeVar("_QuerySet", bound=QuerySet) | ||
| # This is deliberately different from _DisplayT defined in contrib.admin.options | ||
| _DisplayCallable: TypeAlias = Union[Callable[[_ModelAdmin, _Model], Any], Callable[[_Model], Any]] # noqa: Y037 |
There was a problem hiding this comment.
Need to suppress Y037. Can't use the pipe syntax here for some reason, otherwise mypy-self-check (3.9) fails with:
django-stubs/contrib/admin/decorators.pyi:18: error: Unsupported left operand type for | ("object")
intgr
commented
Dec 14, 2022
| @@ -154,7 +156,7 @@ class ModelAdmin(BaseModelAdmin[_ModelT]): | |||
| delete_selected_confirmation_template: _TemplateForResponseT | None | |||
| object_history_template: _TemplateForResponseT | None | |||
| popup_response_template: _TemplateForResponseT | None | |||
| actions: Sequence[Callable[[ModelAdmin, HttpRequest, QuerySet], None] | str] | None | |||
| actions: Sequence[_ActionCallable[Any, _ModelT] | str] | None | |||
There was a problem hiding this comment.
It s unfortunate that we have replaceModelAdmin with Any here. But hopefully in the future it's possible to use Self.
intgr
changed the title
intgr
changed the title
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.
Some follow-up additions on top of #1267:
@displaydecorator now supports usage forModelAdminmethods as well._StrPromiseto_StrOrPromisewhere plainstrshould be supported as well.ModelAdmin.displaydidn't previously allow functions returning booleans.ModelAdmin.actionsdidn't previously allow having accurate type hints of the passed function (only allowed base classModelAdmin)