Skip to content

Commit 0381fdb

Browse files
authored
Add some types to views (#1221)
* Add some types to views * Remove GeoModelAdmin.formfield_for_dbfield
1 parent f566734 commit 0381fdb

File tree

6 files changed

+36
-20
lines changed

6 files changed

+36
-20
lines changed

django-stubs/contrib/admin/options.pyi

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -190,16 +190,16 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
190190
def media(self) -> Media: ...
191191
def get_model_perms(self, request: HttpRequest) -> Dict[str, bool]: ...
192192
def get_form(
193-
self, request: Any, obj: Optional[_ModelT] = ..., change: bool = ..., **kwargs: Any
193+
self, request: HttpRequest, obj: Optional[_ModelT] = ..., change: bool = ..., **kwargs: Any
194194
) -> Type[forms.ModelForm[_ModelT]]: ...
195195
def get_changelist(self, request: HttpRequest, **kwargs: Any) -> Type[ChangeList]: ...
196196
def get_changelist_instance(self, request: HttpRequest) -> ChangeList: ...
197197
def get_object(
198198
self, request: HttpRequest, object_id: str, from_field: Optional[str] = ...
199199
) -> Optional[_ModelT]: ...
200-
def get_changelist_form(self, request: Any, **kwargs: Any) -> Type[ModelForm[_ModelT]]: ...
200+
def get_changelist_form(self, request: HttpRequest, **kwargs: Any) -> Type[ModelForm[_ModelT]]: ...
201201
def get_changelist_formset(
202-
self, request: Any, **kwargs: Any
202+
self, request: HttpRequest, **kwargs: Any
203203
) -> Type[BaseModelFormSet[_ModelT, ModelForm[_ModelT]]]: ...
204204
def get_formsets_with_inlines(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> Iterator[Any]: ...
205205
def get_paginator(
@@ -241,21 +241,21 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
241241
extra_tags: str = ...,
242242
fail_silently: bool = ...,
243243
) -> None: ...
244-
def save_form(self, request: Any, form: Any, change: Any) -> Any: ...
245-
def save_model(self, request: Any, obj: _ModelT, form: Any, change: Any) -> None: ...
244+
def save_form(self, request: HttpRequest, form: Any, change: Any) -> Any: ...
245+
def save_model(self, request: HttpRequest, obj: _ModelT, form: Any, change: Any) -> None: ...
246246
def delete_model(self, request: HttpRequest, obj: _ModelT) -> None: ...
247247
def delete_queryset(self, request: HttpRequest, queryset: QuerySet) -> None: ...
248-
def save_formset(self, request: Any, form: Any, formset: Any, change: Any) -> None: ...
249-
def save_related(self, request: Any, form: Any, formsets: Any, change: Any) -> None: ...
248+
def save_formset(self, request: HttpRequest, form: Any, formset: Any, change: Any) -> None: ...
249+
def save_related(self, request: HttpRequest, form: Any, formsets: Any, change: Any) -> None: ...
250250
def render_change_form(
251251
self,
252-
request: Any,
253-
context: Any,
252+
request: HttpRequest,
253+
context: Dict[str, Any],
254254
add: bool = ...,
255255
change: bool = ...,
256256
form_url: str = ...,
257257
obj: Optional[_ModelT] = ...,
258-
) -> Any: ...
258+
) -> HttpResponse: ...
259259
def response_add(
260260
self, request: HttpRequest, obj: _ModelT, post_url_continue: Optional[str] = ...
261261
) -> HttpResponse: ...
@@ -265,7 +265,7 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
265265
# Probably FileResponse cannot come from ModelAdmin views
266266
def response_action(self, request: HttpRequest, queryset: QuerySet) -> Optional[HttpResponse]: ...
267267
def response_delete(self, request: HttpRequest, obj_display: str, obj_id: int) -> HttpResponse: ...
268-
def render_delete_form(self, request: Any, context: Any) -> Any: ...
268+
def render_delete_form(self, request: HttpRequest, context: Dict[str, Any]) -> HttpResponse: ...
269269
def get_inline_formsets(
270270
self, request: HttpRequest, formsets: List[Any], inline_instances: List[Any], obj: Optional[_ModelT] = ...
271271
) -> List[Any]: ...

django-stubs/contrib/gis/admin/options.pyi

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class GeoModelAdmin(ModelAdmin):
3636
widget: Any = ...
3737
@property
3838
def media(self) -> Any: ...
39-
def formfield_for_dbfield(self, db_field: Any, request: Any, **kwargs: Any) -> Any: ...
4039
def get_map_widget(self, db_field: Any) -> Any: ...
4140

4241
class OSMGeoAdmin(GeoModelAdmin):
Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1-
from typing import Any, Optional
1+
from typing import Optional
2+
3+
from django.http import HttpRequest, HttpResponse
24

35
def kml(
4-
request: Any, label: Any, model: Any, field_name: Optional[Any] = ..., compress: bool = ..., using: Any = ...
5-
) -> Any: ...
6-
def kmz(request: Any, label: Any, model: Any, field_name: Optional[Any] = ..., using: Any = ...) -> Any: ...
6+
request: HttpRequest,
7+
label: str,
8+
model: str,
9+
field_name: Optional[str] = ...,
10+
compress: bool = ...,
11+
using: str = ...,
12+
) -> HttpResponse: ...
13+
def kmz(
14+
request: HttpRequest, label: str, model: str, field_name: Optional[str] = ..., using: str = ...
15+
) -> HttpResponse: ...

django-stubs/contrib/gis/views.pyi

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
from typing import Any, Optional
1+
from typing import Dict, Optional, Type
22

3-
def feed(request: Any, url: Any, feed_dict: Optional[Any] = ...) -> Any: ...
3+
from django.contrib.gis.feeds import Feed
4+
from django.http import HttpRequest, HttpResponse
5+
6+
def feed(request: HttpRequest, url: str, feed_dict: Optional[Dict[str, Type[Feed]]] = ...) -> HttpResponse: ...

django-stubs/test/testcases.pyi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ from django.db.models.base import Model
3131
from django.db.models.query import QuerySet, RawQuerySet
3232
from django.forms import BaseFormSet, Form
3333
from django.forms.fields import EmailField
34+
from django.http import HttpRequest
3435
from django.http.response import FileResponse, HttpResponseBase
3536
from django.template.base import Template
3637
from django.test.client import AsyncClient, Client
@@ -241,7 +242,7 @@ class FSFilesHandler(WSGIHandler):
241242
base_url: Any = ...
242243
def __init__(self, application: Any) -> None: ...
243244
def file_path(self, url: Any) -> str: ...
244-
def serve(self, request: Any) -> FileResponse: ...
245+
def serve(self, request: HttpRequest) -> FileResponse: ...
245246

246247
class _StaticFilesHandler(FSFilesHandler):
247248
def get_base_dir(self) -> str: ...

django-stubs/views/debug.pyi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ class CallableSettingWrapper:
1414
def __init__(self, callable_setting: Union[Callable, Type[Any]]) -> None: ...
1515

1616
def technical_500_response(
17-
request: Any, exc_type: Any, exc_value: Any, tb: Any, status_code: int = ...
17+
request: HttpRequest,
18+
exc_type: Optional[Type[BaseException]],
19+
exc_value: Optional[BaseException],
20+
tb: Optional[TracebackType],
21+
status_code: int = ...,
1822
) -> HttpResponse: ...
1923
def get_default_exception_reporter_filter() -> SafeExceptionReporterFilter: ...
2024
def get_exception_reporter_filter(request: Optional[HttpRequest]) -> SafeExceptionReporterFilter: ...

0 commit comments

Comments
 (0)