From b636d240517e5786d656024b312518c2c8a421cd Mon Sep 17 00:00:00 2001 From: Maxim Kurnikov Date: Thu, 31 Jan 2019 18:28:18 +0300 Subject: [PATCH] fixes for stubs --- django-stubs/contrib/postgres/fields/array.pyi | 8 -------- django-stubs/contrib/postgres/fields/ranges.pyi | 17 ----------------- django-stubs/db/models/fields/__init__.pyi | 1 + django-stubs/utils/tree.pyi | 4 ++-- 4 files changed, 3 insertions(+), 27 deletions(-) diff --git a/django-stubs/contrib/postgres/fields/array.pyi b/django-stubs/contrib/postgres/fields/array.pyi index 4871c5c..6c2e8c8 100644 --- a/django-stubs/contrib/postgres/fields/array.pyi +++ b/django-stubs/contrib/postgres/fields/array.pyi @@ -13,22 +13,14 @@ class ArrayField(CheckFieldDefaultMixin, Field, Generic[_T]): default_validators: Any = ... from_db_value: Any = ... def __init__(self, base_field: _T, size: None = ..., **kwargs: Any) -> None: ... - @property - def model(self): ... - @model.setter - def model(self, model: Any) -> None: ... def check(self, **kwargs: Any) -> List[Any]: ... - def set_attributes_from_name(self, name: str) -> None: ... @property def description(self): ... - def db_type(self, connection: Any): ... def get_db_prep_value(self, value: Any, connection: Any, prepared: bool = ...): ... - def deconstruct(self) -> Tuple[None, str, List[Any], Dict[str, Optional[Union[bool, Field]]]]: ... def to_python(self, value: Any): ... def value_to_string(self, obj: Any): ... def get_transform(self, name: Any): ... def validate(self, value: Any, model_instance: Any) -> None: ... def run_validators(self, value: Any) -> None: ... - def formfield(self, **kwargs: Any): ... def __set__(self, instance, value: Sequence[_T]): ... def __get__(self, instance, owner) -> List[_T]: ... diff --git a/django-stubs/contrib/postgres/fields/ranges.pyi b/django-stubs/contrib/postgres/fields/ranges.pyi index 5e628aa..64d0a9a 100644 --- a/django-stubs/contrib/postgres/fields/ranges.pyi +++ b/django-stubs/contrib/postgres/fields/ranges.pyi @@ -5,43 +5,26 @@ from django.db import models class RangeField(models.Field): empty_strings_allowed: bool = ... base_field: Any = ... - def __init__(self, *args: Any, **kwargs: Any) -> None: ... - @property - def model(self): ... - @model.setter - def model(self, model: Any) -> None: ... def get_prep_value(self, value: Any): ... def to_python(self, value: Any): ... - def set_attributes_from_name(self, name: str) -> None: ... def value_to_string(self, obj: Any): ... - def formfield(self, **kwargs: Any): ... class IntegerRangeField(RangeField): base_field: Any = ... range_type: Any = ... - form_field: Any = ... - def db_type(self, connection: Any): ... class BigIntegerRangeField(RangeField): base_field: Any = ... range_type: Any = ... - form_field: Any = ... - def db_type(self, connection: Any): ... class FloatRangeField(RangeField): base_field: Any = ... range_type: Any = ... - form_field: Any = ... - def db_type(self, connection: Any): ... class DateTimeRangeField(RangeField): base_field: Any = ... range_type: Any = ... - form_field: Any = ... - def db_type(self, connection: Any): ... class DateRangeField(RangeField): base_field: Any = ... range_type: Any = ... - form_field: Any = ... - def db_type(self, connection: Any): ... diff --git a/django-stubs/db/models/fields/__init__.pyi b/django-stubs/db/models/fields/__init__.pyi index 11b47f4..9551a97 100644 --- a/django-stubs/db/models/fields/__init__.pyi +++ b/django-stubs/db/models/fields/__init__.pyi @@ -45,6 +45,7 @@ class Field(RegisterLookupMixin): def __get__(self, instance, owner) -> Any: ... def deconstruct(self) -> Any: ... def set_attributes_from_name(self, name: str) -> None: ... + def db_type(self, connection: Any) -> str: ... def db_parameters(self, connection: Any) -> Dict[str, str]: ... def get_prep_value(self, value: Any) -> Any: ... def formfield(self, **kwargs) -> FormField: ... diff --git a/django-stubs/utils/tree.pyi b/django-stubs/utils/tree.pyi index 9c042c2..caaf8e3 100644 --- a/django-stubs/utils/tree.pyi +++ b/django-stubs/utils/tree.pyi @@ -1,4 +1,4 @@ -from typing import Any, Dict, Iterable, Optional, Tuple +from typing import Any, Dict, Iterable, Optional, Tuple, Union from django.db.models.sql.where import NothingNode @@ -7,7 +7,7 @@ class Node: connector: str = ... negated: bool = ... def __init__( - self, children: Optional[Iterable[Node, NothingNode]] = ..., connector: Optional[str] = ..., negated: bool = ... + self, children: Optional[Iterable[Union[Node, NothingNode]]] = ..., connector: Optional[str] = ..., negated: bool = ... ) -> None: ... def __deepcopy__(self, memodict: Dict[Any, Any]) -> Node: ... def __len__(self) -> int: ...