Skip to content

Commit

Permalink
Reformat with black
Browse files Browse the repository at this point in the history
  • Loading branch information
sterliakov committed Mar 28, 2022
1 parent f4cbb4c commit e3ffba6
Show file tree
Hide file tree
Showing 143 changed files with 677 additions and 702 deletions.
2 changes: 1 addition & 1 deletion django-stubs/apps/config.pyi
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from typing import Dict, Iterator, Optional, Type
import types
from typing import Dict, Iterator, Optional, Type

from django.apps.registry import Apps
from django.db.models.base import Model
Expand Down
2 changes: 0 additions & 2 deletions django-stubs/conf/__init__.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ ENVIRONMENT_VARIABLE: str = ...
PASSWORD_RESET_TIMEOUT_DAYS_DEPRECATED_MSG: str = ...
DEFAULT_HASHING_ALGORITHM_DEPRECATED_MSG: str = ...


# required for plugin to be able to distinguish this specific instance of LazySettings from others
class _DjangoConfLazyObject(LazyObject):
def __getattr__(self, item: Any) -> Any: ...
Expand All @@ -27,7 +26,6 @@ class Settings:

class UserSettingsHolder:
SETTINGS_MODULE: Optional[Any] = ...

def __init__(self, default_settings: Any) -> None: ...
def __getattr__(self, name: str) -> Any: ...
def __setattr__(self, name: str, value: Any) -> None: ...
Expand Down
5 changes: 4 additions & 1 deletion django-stubs/conf/urls/__init__.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,8 @@ def url(
) -> URLResolver: ...
@overload
def url(
regex: str, view: Sequence[Union[URLResolver, str]], kwargs: Optional[Dict[str, Any]] = ..., name: Optional[str] = ...
regex: str,
view: Sequence[Union[URLResolver, str]],
kwargs: Optional[Dict[str, Any]] = ...,
name: Optional[str] = ...,
) -> URLResolver: ...
19 changes: 13 additions & 6 deletions django-stubs/contrib/admin/helpers.pyi
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import sys
from typing import (
Any, Callable, Dict, Iterable, Iterator, List, Mapping,
Optional, Sequence, Tuple, Union,
)
from typing import Any, Callable, Dict, Iterable, Iterator, List, Mapping, Optional, Sequence, Tuple, Union

from django import forms
from django.contrib.admin.options import ModelAdmin
Expand Down Expand Up @@ -80,7 +77,11 @@ class Fieldline:
model_admin: Optional[ModelAdmin] = ...
readonly_fields: Sequence[str] = ...
def __init__(
self, form: ModelForm, field: Union[str, Sequence[str]], readonly_fields: Optional[Sequence[str]] = ..., model_admin: Optional[ModelAdmin] = ...
self,
form: ModelForm,
field: Union[str, Sequence[str]],
readonly_fields: Optional[Sequence[str]] = ...,
model_admin: Optional[ModelAdmin] = ...,
) -> None: ...
def __iter__(self) -> Iterator[Union[AdminField, AdminReadonlyField]]: ...
def errors(self) -> SafeString: ...
Expand Down Expand Up @@ -108,7 +109,13 @@ class AdminReadonlyField:
is_checkbox: bool = ...
is_readonly: bool = ...
empty_value_display: Any = ...
def __init__(self, form: ModelForm, field: Union[Callable[[Model], Any], str], is_first: bool, model_admin: Optional[ModelAdmin] = ...) -> None: ...
def __init__(
self,
form: ModelForm,
field: Union[Callable[[Model], Any], str],
is_first: bool,
model_admin: Optional[ModelAdmin] = ...,
) -> None: ...
def label_tag(self) -> SafeString: ...
def contents(self) -> SafeString: ...

Expand Down
32 changes: 14 additions & 18 deletions django-stubs/contrib/admin/options.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ from typing import (
Union,
)


from django import forms
from django.contrib.admin.filters import ListFilter, FieldListFilter
from django.contrib.admin.filters import FieldListFilter, ListFilter
from django.contrib.admin.models import LogEntry
from django.contrib.admin.sites import AdminSite
from django.contrib.admin.views.main import ChangeList
Expand All @@ -32,7 +31,8 @@ from django.db.models.fields import Field
from django.db.models.fields.related import ForeignKey, ManyToManyField, RelatedField
from django.db.models.options import Options
from django.db.models.query import QuerySet
from django.forms.fields import Field as FormField, TypedChoiceField
from django.forms.fields import Field as FormField
from django.forms.fields import TypedChoiceField
from django.forms.forms import BaseForm
from django.forms.formsets import BaseFormSet
from django.forms.models import BaseInlineFormSet, ModelChoiceField, ModelMultipleChoiceField
Expand All @@ -41,8 +41,8 @@ from django.http.request import HttpRequest
from django.http.response import HttpResponse, HttpResponseRedirect, JsonResponse
from django.template.response import _TemplateForResponseT
from django.urls.resolvers import URLPattern
from django.utils.safestring import SafeString
from django.utils.datastructures import _ListOrTuple
from django.utils.safestring import SafeString

if sys.version_info < (3, 8):
from typing_extensions import Literal, TypedDict
Expand Down Expand Up @@ -112,12 +112,8 @@ class BaseModelAdmin(Generic[_ModelT]):
admin_site: AdminSite
def __init__(self) -> None: ...
def check(self, **kwargs: Any) -> List[CheckMessage]: ...
def formfield_for_dbfield(
self, db_field: Field, request: HttpRequest, **kwargs: Any
) -> Optional[FormField]: ...
def formfield_for_choice_field(
self, db_field: Field, request: HttpRequest, **kwargs: Any
) -> TypedChoiceField: ...
def formfield_for_dbfield(self, db_field: Field, request: HttpRequest, **kwargs: Any) -> Optional[FormField]: ...
def formfield_for_choice_field(self, db_field: Field, request: HttpRequest, **kwargs: Any) -> TypedChoiceField: ...
def get_field_queryset(
self, db: Optional[str], db_field: RelatedField, request: HttpRequest
) -> Optional[QuerySet]: ...
Expand All @@ -132,13 +128,13 @@ class BaseModelAdmin(Generic[_ModelT]):
def get_empty_value_display(self) -> SafeString: ...
def get_exclude(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> Optional[Sequence[str]]: ...
def get_fields(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> _FieldGroups: ...
def get_fieldsets(
self, request: HttpRequest, obj: Optional[_ModelT] = ...
) -> _FieldsetSpec: ...
def get_fieldsets(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> _FieldsetSpec: ...
def get_inlines(self, request: HttpRequest, obj: Optional[_ModelT]) -> List[Type[InlineModelAdmin]]: ...
def get_ordering(self, request: HttpRequest) -> Sequence[str]: ...
def get_readonly_fields(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> Sequence[str]: ...
def get_prepopulated_fields(self, request: HttpRequest, obj: Optional[_ModelT] = ...) -> Dict[str, Sequence[str]]: ...
def get_prepopulated_fields(
self, request: HttpRequest, obj: Optional[_ModelT] = ...
) -> Dict[str, Sequence[str]]: ...
def get_queryset(self, request: HttpRequest) -> QuerySet[_ModelT]: ...
def get_sortable_by(self, request: HttpRequest) -> Sequence[str]: ...
def lookup_allowed(self, lookup: str, value: str) -> bool: ...
Expand Down Expand Up @@ -191,7 +187,9 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
@property
def media(self) -> Media: ...
def get_model_perms(self, request: HttpRequest) -> Dict[str, bool]: ...
def get_form(self, request: Any, obj: Optional[_ModelT] = ..., change: bool = ..., **kwargs: Any) -> Type[forms.ModelForm[_ModelT]]: ...
def get_form(
self, request: Any, obj: Optional[_ModelT] = ..., change: bool = ..., **kwargs: Any
) -> Type[forms.ModelForm[_ModelT]]: ...
def get_changelist(self, request: HttpRequest, **kwargs: Any) -> Type[ChangeList]: ...
def get_changelist_instance(self, request: HttpRequest) -> ChangeList: ...
def get_object(
Expand Down Expand Up @@ -281,9 +279,7 @@ class ModelAdmin(BaseModelAdmin[_ModelT]):
def change_view(
self, request: HttpRequest, object_id: str, form_url: str = ..., extra_context: Optional[Dict[str, Any]] = ...
) -> HttpResponse: ...
def changelist_view(
self, request: HttpRequest, extra_context: Optional[Dict[str, Any]] = ...
) -> HttpResponse: ...
def changelist_view(self, request: HttpRequest, extra_context: Optional[Dict[str, Any]] = ...) -> HttpResponse: ...
def get_deleted_objects(
self, objs: Union[Sequence[_ModelT], QuerySet[_ModelT]], request: HttpRequest
) -> Tuple[List[Model], Dict[str, int], Set[str], List[str]]: ...
Expand Down
6 changes: 1 addition & 5 deletions django-stubs/contrib/admin/sites.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ from django.contrib.auth.forms import AuthenticationForm
from django.core.checks import CheckMessage
from django.db.models.base import Model
from django.db.models.query import QuerySet
from django.http.response import HttpResponse
from django.http.request import HttpRequest
from django.http.response import HttpResponse
from django.template.response import TemplateResponse
from django.urls import URLPattern, URLResolver
from django.utils.functional import LazyObject
Expand Down Expand Up @@ -62,10 +62,6 @@ class AdminSite:
def get_action(self, name: str) -> Callable: ...
@property
def actions(self) -> Iterable[Tuple[str, _ActionCallback]]: ...




def has_permission(self, request: HttpRequest) -> bool: ...
def admin_view(self, view: Callable, cacheable: bool = ...) -> Callable: ...
def get_urls(self) -> List[Union[URLResolver, URLPattern]]: ...
Expand Down
12 changes: 2 additions & 10 deletions django-stubs/contrib/admin/utils.pyi
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import datetime
import sys
from typing import (
Any, Callable, Dict, Iterable, List, Optional, Sequence, Set,
Tuple, Type, Union, overload
)
from typing import Any, Callable, Dict, Iterable, List, Optional, Sequence, Set, Tuple, Type, Union, overload
from uuid import UUID

from django.contrib.admin.options import BaseModelAdmin
Expand Down Expand Up @@ -48,10 +45,7 @@ class NestedObjects(Collector):
def __init__(self, *args: Any, **kwargs: Any) -> None: ...
def add_edge(self, source: Optional[Model], target: Model) -> None: ...
def related_objects(
self,
related_model: Type[Model],
related_fields: Iterable[Field],
objs: _IndexableCollection[Model]
self, related_model: Type[Model], related_fields: Iterable[Field], objs: _IndexableCollection[Model]
) -> QuerySet[Model]: ...
def nested(self, format_callback: Callable = ...) -> List[Any]: ...
def can_fast_delete(self, *args: Any, **kwargs: Any) -> bool: ...
Expand All @@ -61,7 +55,6 @@ def model_ngettext(obj: Union[Options, QuerySet], n: Optional[int] = ...) -> str
def lookup_field(
name: Union[Callable, str], obj: Model, model_admin: Optional[BaseModelAdmin] = ...
) -> Tuple[Optional[Field], Optional[str], Any]: ...

@overload
def label_for_field( # type: ignore
name: Union[Callable, str],
Expand All @@ -78,7 +71,6 @@ def label_for_field(
return_attr: Literal[False] = ...,
form: Optional[BaseForm] = ...,
) -> str: ...

def help_text_for_field(name: str, model: Type[Model]) -> str: ...
def display_for_field(value: Any, field: Field, empty_value_display: str) -> str: ...
def display_for_value(value: Any, empty_value_display: str, boolean: bool = ...) -> str: ...
Expand Down
14 changes: 4 additions & 10 deletions django-stubs/contrib/admin/views/main.pyi
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
import sys
from typing import (
Any, Callable, Dict, Iterable, List, Optional, Sequence, Tuple, Type, Union
)
from typing import Any, Callable, Dict, Iterable, List, Optional, Sequence, Tuple, Type, Union

from django.contrib.admin.filters import ListFilter
from django.contrib.admin.options import IS_POPUP_VAR as IS_POPUP_VAR # noqa: F401
from django.contrib.admin.options import TO_FIELD_VAR as TO_FIELD_VAR
from django.contrib.admin.options import ModelAdmin

from django.contrib.admin.options import _ListFilterT, _DisplayT
from django.contrib.admin.options import ModelAdmin, _DisplayT, _ListFilterT
from django.db.models.base import Model
from django.db.models.expressions import Expression
from django.db.models.options import Options
Expand Down Expand Up @@ -77,9 +73,7 @@ class ChangeList:
self, request: HttpRequest
) -> Tuple[List[ListFilter], bool, Dict[str, Union[bool, str]], bool, bool]: ...
def get_query_string(
self,
new_params: Optional[Dict[str, Any]] = ...,
remove: Optional[Iterable[str]] = ...
self, new_params: Optional[Dict[str, Any]] = ..., remove: Optional[Iterable[str]] = ...
) -> str: ...
result_count: int = ...
show_full_result_count: bool = ...
Expand All @@ -92,7 +86,7 @@ class ChangeList:
def get_results(self, request: HttpRequest) -> None: ...
def get_ordering_field(self, field_name: Union[Callable, str]) -> Optional[Union[Expression, str]]: ...
def get_ordering(self, request: HttpRequest, queryset: QuerySet) -> List[Union[Expression, str]]: ...
def get_ordering_field_columns(self) -> Dict[int, Literal['desc', 'asc']]: ...
def get_ordering_field_columns(self) -> Dict[int, Literal["desc", "asc"]]: ...
def get_queryset(self, request: HttpRequest) -> QuerySet: ...
filter_specs: List[ListFilter]
has_filters: bool
Expand Down
33 changes: 15 additions & 18 deletions django-stubs/contrib/admin/widgets.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,21 @@ from typing import Any, Dict, Iterable, List, Mapping, Optional, Sequence, Tuple
from django import forms
from django.contrib.admin.sites import AdminSite
from django.core.files.base import File
from django.db.models.fields.reverse_related import (
ForeignObjectRel, ManyToOneRel, ManyToManyRel
)
from django.forms.models import ModelChoiceIterator
from django.forms.widgets import Media
from django.db.models.fields import _FieldChoices
from django.forms.widgets import _OptAttrs

from django.db.models.fields.reverse_related import ForeignObjectRel, ManyToManyRel, ManyToOneRel
from django.forms.models import ModelChoiceIterator
from django.forms.widgets import Media, _OptAttrs

class FilteredSelectMultiple(forms.SelectMultiple):
verbose_name: str = ...
is_stacked: bool = ...
def __init__(
self,
verbose_name: str,
is_stacked: bool,
attrs: Optional[_OptAttrs] = ...,
choices: _FieldChoices = ...
self, verbose_name: str, is_stacked: bool, attrs: Optional[_OptAttrs] = ..., choices: _FieldChoices = ...
) -> None: ...

class AdminDateWidget(forms.DateInput):
def __init__(self, attrs: Optional[_OptAttrs] = ..., format: Optional[str] = ...) -> None: ...

class AdminTimeWidget(forms.TimeInput):
def __init__(self, attrs: Optional[_OptAttrs] = ..., format: Optional[str] = ...) -> None: ...

Expand All @@ -42,7 +35,9 @@ class ForeignKeyRawIdWidget(forms.TextInput):
rel: ManyToOneRel = ...
admin_site: AdminSite = ...
db: Optional[str] = ...
def __init__(self, rel: ManyToOneRel, admin_site: AdminSite, attrs: Optional[_OptAttrs] = ..., using: Optional[str] = ...) -> None: ...
def __init__(
self, rel: ManyToOneRel, admin_site: AdminSite, attrs: Optional[_OptAttrs] = ..., using: Optional[str] = ...
) -> None: ...
def base_url_parameters(self) -> Dict[str, str]: ...
def get_context(self, name: str, value: Any, attrs: Optional[_OptAttrs]) -> Dict[str, Any]: ...
def url_parameters(self) -> Dict[str, str]: ...
Expand Down Expand Up @@ -83,7 +78,9 @@ class RelatedFieldWidgetWrapper(forms.Widget):
def get_related_url(self, info: Tuple[str, str], action: str, *args: Any) -> str: ...
def get_context(self, name: str, value: Any, attrs: Optional[_OptAttrs]) -> Dict[str, Any]: ...
def value_from_datadict(self, data: Mapping[str, Any], files: Mapping[str, Iterable[File]], name: str) -> Any: ...
def value_omitted_from_data(self, data: Mapping[str, Any], files: Mapping[str, Iterable[File]], name: str) -> bool: ...
def value_omitted_from_data(
self, data: Mapping[str, Any], files: Mapping[str, Iterable[File]], name: str
) -> bool: ...
def id_for_label(self, id_: str) -> str: ...

class AdminTextareaWidget(forms.Textarea):
Expand Down Expand Up @@ -130,11 +127,11 @@ class AutocompleteMixin:
def get_url(self) -> str: ...
@property
def media(self) -> Media: ...
def build_attrs(
self, base_attrs: _OptAttrs, extra_attrs: Optional[_OptAttrs] = ...
) -> Dict[str, Any]: ...
def build_attrs(self, base_attrs: _OptAttrs, extra_attrs: Optional[_OptAttrs] = ...) -> Dict[str, Any]: ...
# typo in source: `attr` instead of `attrs`
def optgroups(self, name: str, value: Sequence[str], attr: Optional[_OptAttrs] = ...) -> List[Tuple[Optional[str], List[Dict[str, Any]], Optional[int]]]: ...
def optgroups(
self, name: str, value: Sequence[str], attr: Optional[_OptAttrs] = ...
) -> List[Tuple[Optional[str], List[Dict[str, Any]], Optional[int]]]: ...

class AutocompleteSelect(AutocompleteMixin, forms.Select): ... # type: ignore
class AutocompleteSelectMultiple(AutocompleteMixin, forms.SelectMultiple): ... # type: ignore
2 changes: 1 addition & 1 deletion django-stubs/contrib/admindocs/middleware.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ class XViewMiddleware(MiddlewareMixin):
request: HttpRequest,
view_func: Callable[..., HttpResponseBase],
view_args: Tuple,
view_kwargs: Dict[Any, Any]
view_kwargs: Dict[Any, Any],
) -> Optional[HttpResponse]: ...
2 changes: 1 addition & 1 deletion django-stubs/contrib/auth/backends.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class ModelBackend(BaseBackend):

class AllowAllUsersModelBackend(ModelBackend): ...

_U = TypeVar('_U', bound=AbstractBaseUser)
_U = TypeVar("_U", bound=AbstractBaseUser)

class RemoteUserBackend(ModelBackend):
create_unknown_user: bool = ...
Expand Down
4 changes: 3 additions & 1 deletion django-stubs/contrib/auth/checks.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ from django.apps.config import AppConfig
from django.core.checks.messages import CheckMessage

def check_user_model(app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any) -> Sequence[CheckMessage]: ...
def check_models_permissions(app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any) -> Sequence[CheckMessage]: ...
def check_models_permissions(
app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any
) -> Sequence[CheckMessage]: ...
7 changes: 3 additions & 4 deletions django-stubs/contrib/auth/forms.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ from django import forms
from django.contrib.auth.base_user import AbstractBaseUser
from django.contrib.auth.tokens import PasswordResetTokenGenerator
from django.core.exceptions import ValidationError
from django.http.request import HttpRequest
from django.db import models
from django.db.models.fields import _ErrorMessagesT
from django.forms.widgets import Widget
from django.forms.fields import _ClassLevelWidgetT

from django.forms.widgets import Widget
from django.http.request import HttpRequest

UserModel: Type[AbstractBaseUser]
_User = TypeVar('_User', bound=AbstractBaseUser)
_User = TypeVar("_User", bound=AbstractBaseUser)

class ReadOnlyPasswordHashWidget(forms.Widget):
template_name: str = ...
Expand Down
2 changes: 1 addition & 1 deletion django-stubs/contrib/auth/models.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class User(AbstractUser): ...
class AnonymousUser:
id: Any = ...
pk: Any = ...
username: Literal[''] = ...
username: Literal[""] = ...
is_staff: Literal[False] = ...
is_active: Literal[False] = ...
is_superuser: Literal[False] = ...
Expand Down
2 changes: 1 addition & 1 deletion django-stubs/contrib/auth/views.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ from typing import Any, Optional, Set
from django.contrib.auth.base_user import AbstractBaseUser
from django.contrib.auth.forms import AuthenticationForm
from django.http.request import HttpRequest
from django.http.response import HttpResponseRedirect, HttpResponse
from django.http.response import HttpResponse, HttpResponseRedirect
from django.views.generic.base import TemplateView
from django.views.generic.edit import FormView

Expand Down
4 changes: 3 additions & 1 deletion django-stubs/contrib/contenttypes/checks.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,6 @@ from django.core.checks.messages import CheckMessage
def check_generic_foreign_keys(
app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any
) -> Sequence[CheckMessage]: ...
def check_model_name_lengths(app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any) -> Sequence[CheckMessage]: ...
def check_model_name_lengths(
app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any
) -> Sequence[CheckMessage]: ...
Loading

0 comments on commit e3ffba6

Please sign in to comment.