split error suppression for tests typechecking, fix ci, bunch of fixes

mkurnikov · mkurnikov · commit d03fddd96d55 · 2019-02-03T19:33:51.000+03:00
diff --git a/django-stubs/contrib/admin/__init__.pyi b/django-stubs/contrib/admin/__init__.pyi
@@ -1,5 +1,5 @@
-from django.contrib.admin.decorators import register as register
-from django.contrib.admin.filters import (
+from .decorators import register as register
+from .filters import (
     AllValuesFieldListFilter as AllValuesFieldListFilter,
     BooleanFieldListFilter as BooleanFieldListFilter,
     ChoicesFieldListFilter as ChoicesFieldListFilter,
@@ -10,14 +10,15 @@ from django.contrib.admin.filters import (
     RelatedOnlyFieldListFilter as RelatedOnlyFieldListFilter,
     SimpleListFilter as SimpleListFilter,
 )
-from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME as ACTION_CHECKBOX_NAME
-from django.contrib.admin.options import (
+from .helpers import ACTION_CHECKBOX_NAME as ACTION_CHECKBOX_NAME
+from .options import (
     HORIZONTAL as HORIZONTAL,
     VERTICAL as VERTICAL,
     ModelAdmin as ModelAdmin,
     StackedInline as StackedInline,
     TabularInline as TabularInline,
 )
-from django.contrib.admin.sites import AdminSite as AdminSite, site as site
+from .sites import AdminSite as AdminSite, site as site
+from . import checks as checks
 
 def autodiscover() -> None: ...
diff --git a/django-stubs/contrib/admin/checks.pyi b/django-stubs/contrib/admin/checks.pyi
@@ -11,11 +11,8 @@ def check_dependencies(**kwargs: Any) -> List[_CheckError]: ...
 class BaseModelAdminChecks:
     def check(self, admin_obj: BaseModelAdmin, **kwargs: Any) -> List[_CheckError]: ...
 
-class ModelAdminChecks(BaseModelAdminChecks):
-    def check(self, admin_obj: ModelAdmin, **kwargs: Any) -> List[_CheckError]: ...
-
-class InlineModelAdminChecks(BaseModelAdminChecks):
-    def check(self, inline_obj: InlineModelAdmin, **kwargs: Any) -> List[_CheckError]: ...
+class ModelAdminChecks(BaseModelAdminChecks): ...
+class InlineModelAdminChecks(BaseModelAdminChecks): ...
 
 def must_be(type: Any, option: Any, obj: Any, id: Any): ...
 def must_inherit_from(parent: Any, option: Any, obj: Any, id: Any): ...
diff --git a/django-stubs/contrib/admin/options.pyi b/django-stubs/contrib/admin/options.pyi
@@ -21,6 +21,7 @@ from django.urls.resolvers import URLPattern
 from django.utils.safestring import SafeText
 
 from django.db.models.fields import Field
+from django.template.response import TemplateResponse
 
 IS_POPUP_VAR: str
 TO_FIELD_VAR: str
@@ -229,7 +230,7 @@ class ModelAdmin(BaseModelAdmin):
     ) -> HttpResponse: ...
     def changelist_view(
         self, request: WSGIRequest, extra_context: Optional[Dict[str, str]] = ...
-    ) -> HttpResponseBase: ...
+    ) -> TemplateResponse: ...
     def get_deleted_objects(
         self, objs: QuerySet, request: WSGIRequest
     ) -> Tuple[List[Any], Dict[Any, Any], Set[Any], List[Any]]: ...
diff --git a/django-stubs/contrib/admin/widgets.pyi b/django-stubs/contrib/admin/widgets.pyi
@@ -3,12 +3,14 @@ from datetime import datetime
 from typing import Any, Callable, Dict, List, Optional, Set, Tuple, Union
 from uuid import UUID
 
+from django.forms.models import ModelChoiceIterator
+
 from django import forms
 from django.contrib.admin.sites import AdminSite
-from django.db.models.fields.reverse_related import ForeignObjectRel
+from django.db.models.fields.reverse_related import ForeignObjectRel, ManyToOneRel, ManyToManyRel
 from django.db.models.query_utils import Q
 from django.forms.fields import Field
-from django.forms.widgets import ChoiceWidget, Media, Widget
+from django.forms.widgets import ChoiceWidget, Media, Widget, DateTimeBaseInput
 from django.http.request import QueryDict
 from django.utils.datastructures import MultiValueDict
 
@@ -92,7 +94,7 @@ def url_params_from_lookup_dict(
 class ForeignKeyRawIdWidget(forms.TextInput):
     attrs: Dict[Any, Any]
     template_name: str = ...
-    rel: django.db.models.fields.reverse_related.ManyToOneRel = ...
+    rel: ManyToOneRel = ...
     admin_site: AdminSite = ...
     db: None = ...
     def __init__(self, rel: ForeignObjectRel, admin_site: AdminSite, attrs: None = ..., using: None = ...) -> None: ...
@@ -107,7 +109,7 @@ class ManyToManyRawIdWidget(ForeignKeyRawIdWidget):
     admin_site: AdminSite
     attrs: Dict[Any, Any]
     db: None
-    rel: django.db.models.fields.reverse_related.ManyToManyRel
+    rel: ManyToManyRel
     template_name: str = ...
     def get_context(
         self, name: str, value: Optional[List[int]], attrs: Optional[Dict[str, str]]
@@ -122,8 +124,8 @@ class RelatedFieldWidgetWrapper(forms.Widget):
     needs_multipart_form: bool = ...
     attrs: Dict[Any, Any] = ...
     choices: ModelChoiceIterator = ...
-    widget: django.contrib.admin.widgets.AutocompleteSelect = ...
-    rel: django.db.models.fields.reverse_related.ManyToOneRel = ...
+    widget: AutocompleteSelect = ...
+    rel: ManyToOneRel = ...
     can_add_related: bool = ...
     can_change_related: bool = ...
     can_delete_related: bool = ...
diff --git a/django-stubs/core/paginator.pyi b/django-stubs/core/paginator.pyi
@@ -14,14 +14,17 @@ class SupportsLen(Protocol):
 class SupportsCount(Protocol):
     def count(self) -> int: ...
 
+class SupportsOrdered(Protocol):
+    ordered: bool = ...
+
 class Paginator:
     object_list: QuerySet = ...
     per_page: int = ...
     orphans: int = ...
     allow_empty_first_page: bool = ...
     def __init__(
         self,
-        object_list: Union[SupportsLen, SupportsCount],
+        object_list: Union[SupportsLen, SupportsCount, SupportsOrdered],
         per_page: Union[int, str],
         orphans: int = ...,
         allow_empty_first_page: bool = ...,
diff --git a/django-stubs/core/signals.pyi b/django-stubs/core/signals.pyi
@@ -0,0 +1,6 @@
+from django.dispatch import Signal
+
+request_started: Signal = ...
+request_finished: Signal = ...
+got_request_exception: Signal = ...
+setting_changed: Signal = ...
diff --git a/django-stubs/db/models/__init__.pyi b/django-stubs/db/models/__init__.pyi
@@ -47,13 +47,15 @@ from .fields.related import (
     ForeignObject as ForeignObject,
 )
 from .fields.files import ImageField as ImageField, FileField as FileField
+from .fields.proxy import OrderWrt as OrderWrt
 
 from .deletion import (
     CASCADE as CASCADE,
     SET_DEFAULT as SET_DEFAULT,
     SET_NULL as SET_NULL,
     DO_NOTHING as DO_NOTHING,
     PROTECT as PROTECT,
+    SET as SET,
 )
 
 from .query import (
@@ -97,3 +99,5 @@ from .aggregates import (
 )
 
 from .indexes import Index as Index
+
+from . import signals as signals
diff --git a/django-stubs/db/models/deletion.pyi b/django-stubs/db/models/deletion.pyi
@@ -1,9 +1,12 @@
+from typing import Any, Callable
+
 from django.db import IntegrityError
 
 def CASCADE(collector, field, sub_objs, using): ...
 def SET_NULL(collector, field, sub_objs, using): ...
 def SET_DEFAULT(collector, field, sub_objs, using): ...
 def DO_NOTHING(collector, field, sub_objs, using): ...
 def PROTECT(collector, field, sub_objs, using): ...
+def SET(value: Any) -> Callable: ...
 
 class ProtectedError(IntegrityError): ...
diff --git a/django-stubs/db/models/fields/proxy.pyi b/django-stubs/db/models/fields/proxy.pyi
@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from django.db.models import fields
 
diff --git a/django-stubs/db/models/query.pyi b/django-stubs/db/models/query.pyi
@@ -152,8 +152,10 @@ class Prefetch(object):
     def get_current_queryset(self, level) -> Optional[QuerySet]: ...
 
 def prefetch_related_objects(model_instances: Iterable[_T], *related_lookups: Union[str, Prefetch]) -> None: ...
-def get_prefetcher(instance: _T, through_attr: str, to_attr: str) -> Tuple[Any, Any, bool, bool]: ...
+def get_prefetcher(instance: Model, through_attr: str, to_attr: str) -> Tuple[Any, Any, bool, bool]: ...
+
+class ModelIterable(Iterable[_T]):
+    def __iter__(self) -> Iterator[_T]: ...
 
-class ModelIterable(Iterable[_T]): ...
 class InstanceCheckMeta(type): ...
 class EmptyQuerySet(metaclass=InstanceCheckMeta): ...
diff --git a/django-stubs/db/models/signals.pyi b/django-stubs/db/models/signals.pyi
@@ -7,15 +7,15 @@ from django.dispatch import Signal
 class_prepared: Any
 
 class ModelSignal(Signal):
-    def connect(
+    def connect(  # type: ignore
         self,
         receiver: Callable,
         sender: Optional[Union[Type[Model], str]] = ...,
         weak: bool = ...,
         dispatch_uid: None = ...,
         apps: Optional[Apps] = ...,
     ) -> None: ...
-    def disconnect(
+    def disconnect(  # type: ignore
         self,
         receiver: Callable = ...,
         sender: Optional[Union[Type[Model], str]] = ...,
diff --git a/django-stubs/dispatch/dispatcher.pyi b/django-stubs/dispatch/dispatcher.pyi
@@ -15,15 +15,15 @@ class Signal:
     def __init__(self, providing_args: List[str] = ..., use_caching: bool = ...) -> None: ...
     def connect(
         self,
-        receiver: Any,
-        sender: Optional[Union[Type[Model], AppConfig]] = ...,
+        receiver: Callable,
+        sender: Optional[Union[Type[Model], AppConfig, str]] = ...,
         weak: bool = ...,
         dispatch_uid: Optional[str] = ...,
     ) -> None: ...
     def disconnect(
         self,
         receiver: Optional[Callable] = ...,
-        sender: Optional[Union[Type[Model], AppConfig]] = ...,
+        sender: Optional[Union[Type[Model], AppConfig, str]] = ...,
         dispatch_uid: Optional[str] = ...,
     ) -> bool: ...
     def has_listeners(self, sender: Any = ...) -> bool: ...
diff --git a/django-stubs/forms/__init__.pyi b/django-stubs/forms/__init__.pyi
@@ -34,6 +34,9 @@ from .widgets import (
     SelectMultiple as SelectMultiple,
     TimeInput as TimeInput,
     URLInput as URLInput,
+    SelectDateWidget as SelectDateWidget,
+    SplitHiddenDateTimeWidget as SplitHiddenDateTimeWidget,
+    SplitDateTimeWidget as SplitDateTimeWidget,
 )
 
 from .fields import (
diff --git a/django-stubs/forms/widgets.pyi b/django-stubs/forms/widgets.pyi
@@ -159,6 +159,7 @@ class SelectMultiple(Select):
     allow_multiple_selected: bool = ...
 
 class RadioSelect(ChoiceWidget):
+    can_add_related: bool
     option_template_name: str = ...
 
 class CheckboxSelectMultiple(ChoiceWidget):
diff --git a/django-stubs/template/__init__.pyi b/django-stubs/template/__init__.pyi
@@ -12,3 +12,5 @@ from .base import Node as Node, NodeList as NodeList, Origin as Origin, Template
 from .context import Context as Context, RequestContext as RequestContext
 
 from .library import Library as Library
+
+from . import defaultfilters as defaultfilters
diff --git a/django-stubs/template/defaultfilters.pyi b/django-stubs/template/defaultfilters.pyi
@@ -1,4 +1,4 @@
-from datetime import date, datetime, timedelta
+from datetime import _date, datetime, timedelta
 from decimal import Decimal
 from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Union
 
@@ -72,14 +72,14 @@ def unordered_list(
     value: Union[Iterator[Any], List[Union[List[Union[List[Union[List[str], str]], str]], str]]], autoescape: bool = ...
 ) -> SafeText: ...
 def add(
-    value: Union[List[int], Tuple[int, int], date, int, str],
+    value: Union[List[int], Tuple[int, int], _date, int, str],
     arg: Union[List[int], Tuple[int, int], timedelta, int, str],
-) -> Union[List[int], Tuple[int, int, int, int], date, int, str]: ...
+) -> Union[List[int], Tuple[int, int, int, int], _date, int, str]: ...
 def get_digit(value: Union[int, str], arg: int) -> Union[int, str]: ...
-def date(value: Optional[Union[datetime, str]], arg: Optional[str] = ...) -> str: ...
+def date(value: Optional[Union[_date, datetime, str]], arg: Optional[str] = ...) -> str: ...
 def time(value: Optional[Union[datetime, str]], arg: Optional[str] = ...) -> str: ...
-def timesince_filter(value: Optional[date], arg: Optional[date] = ...) -> str: ...
-def timeuntil_filter(value: Optional[date], arg: Optional[date] = ...) -> str: ...
+def timesince_filter(value: Optional[_date], arg: Optional[_date] = ...) -> str: ...
+def timeuntil_filter(value: Optional[_date], arg: Optional[_date] = ...) -> str: ...
 def default(value: Optional[Union[int, str]], arg: Union[int, str]) -> Union[int, str]: ...
 def default_if_none(value: Optional[str], arg: Union[int, str]) -> Union[int, str]: ...
 def divisibleby(value: int, arg: int) -> bool: ...
diff --git a/django-stubs/test/signals.pyi b/django-stubs/test/signals.pyi
@@ -1,4 +1,5 @@
 from typing import Any
+from django.core.signals import setting_changed as setting_changed
 
 template_rendered: Any
 COMPLEX_OVERRIDE_SETTINGS: Any
diff --git a/django-stubs/test/utils.pyi b/django-stubs/test/utils.pyi
@@ -1,5 +1,6 @@
 import decimal
 import warnings
+from io import StringIO
 from contextlib import contextmanager
 from decimal import Decimal
 from typing import Any, Callable, Dict, Iterator, List, Optional, Set, Tuple, Type, Union, IO
@@ -107,13 +108,13 @@ class isolate_apps(TestContextDecorator):
 @contextmanager
 def extend_sys_path(*paths: str) -> Iterator[None]: ...
 @contextmanager
-def captured_output(stream_name) -> Iterator[IO[str]]: ...
+def captured_output(stream_name) -> Iterator[StringIO]: ...
 @contextmanager
-def captured_stdin() -> Iterator[IO[str]]: ...
+def captured_stdin() -> Iterator[StringIO]: ...
 @contextmanager
-def captured_stdout() -> Iterator[IO[str]]: ...
+def captured_stdout() -> Iterator[StringIO]: ...
 @contextmanager
-def captured_stderr() -> Iterator[IO[str]]: ...
+def captured_stderr() -> Iterator[StringIO]: ...
 @contextmanager
 def freeze_time(t: float) -> Iterator[None]: ...
 def tag(*tags: str): ...
diff --git a/scripts/typecheck_tests.py b/scripts/typecheck_tests.py

Original file line number	Diff line number	Diff line change
`@@ -47,13 +47,15 @@ from .fields.related import (`
`47`	`47`	`ForeignObject as ForeignObject,`
`48`	`48`	`)`
`49`	`49`	`from .fields.files import ImageField as ImageField, FileField as FileField`
	`50`	`+from .fields.proxy import OrderWrt as OrderWrt`
`50`	`51`
`51`	`52`	`from .deletion import (`
`52`	`53`	`CASCADE as CASCADE,`
`53`	`54`	`SET_DEFAULT as SET_DEFAULT,`
`54`	`55`	`SET_NULL as SET_NULL,`
`55`	`56`	`DO_NOTHING as DO_NOTHING,`
`56`	`57`	`PROTECT as PROTECT,`
	`58`	`+ SET as SET,`
`57`	`59`	`)`
`58`	`60`
`59`	`61`	`from .query import (`
`@@ -97,3 +99,5 @@ from .aggregates import (`
`97`	`99`	`)`
`98`	`100`
`99`	`101`	`from .indexes import Index as Index`
	`102`	`+`
	`103`	`+from . import signals as signals`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from typing import Any, Optional`
	`1`	`+from typing import Any`
`2`	`2`
`3`	`3`	`from django.db.models import fields`
`4`	`4`