diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 71ce3de..c98d038 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,7 @@ default_language_version: python: python3.9 repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.3.0 + rev: v4.0.1 hooks: - id: check-yaml - id: trailing-whitespace @@ -12,20 +12,26 @@ repos: - id: debug-statements - id: check-merge-conflict - repo: https://github.com/asottile/pyupgrade - rev: v2.7.3 + rev: v2.20.0 hooks: - id: pyupgrade args: ["--py36-plus"] - repo: https://github.com/pre-commit/mirrors-isort - rev: v5.6.4 + rev: v5.9.1 hooks: - id: isort + name: isort (python) + args: ["--profile", "black"] + - id: isort + name: isort (pyi) + types: [pyi] + args: ["--profile", "black"] - repo: https://github.com/psf/black - rev: 20.8b1 + rev: 21.6b0 hooks: - id: black - repo: https://gitlab.com/pycqa/flake8 - rev: 3.8.4 + rev: 3.9.2 hooks: - id: flake8 - repo: local diff --git a/dev-requirements.txt b/dev-requirements.txt index 194a790..751b080 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -3,7 +3,7 @@ black==21.6b0 requests==2.24.0 coreapi==2.3.3 gitpython==3.1.9 -pre-commit==2.7.1 +pre-commit==2.13.0 pytest==6.1.1 pytest-mypy-plugins==1.7.0 psycopg2-binary diff --git a/django-stubs/__init__.pyi b/django-stubs/__init__.pyi index 83b267d..c705a44 100644 --- a/django-stubs/__init__.pyi +++ b/django-stubs/__init__.pyi @@ -1,4 +1,5 @@ from typing import Any, NamedTuple + from .utils.version import get_version as get_version VERSION: Any diff --git a/django-stubs/apps/__init__.pyi b/django-stubs/apps/__init__.pyi index 4a783cc..8270abf 100644 --- a/django-stubs/apps/__init__.pyi +++ b/django-stubs/apps/__init__.pyi @@ -1,3 +1,2 @@ from .config import AppConfig as AppConfig - from .registry import apps as apps diff --git a/django-stubs/apps/config.pyi b/django-stubs/apps/config.pyi index aa3fb80..3a6f4e9 100644 --- a/django-stubs/apps/config.pyi +++ b/django-stubs/apps/config.pyi @@ -1,4 +1,4 @@ -from typing import Any, Iterator, Type, Optional, Dict +from typing import Any, Dict, Iterator, Optional, Type from django.apps.registry import Apps from django.db.models.base import Model diff --git a/django-stubs/conf/locale/__init__.pyi b/django-stubs/conf/locale/__init__.pyi index 4bd5cdf..b7629af 100644 --- a/django-stubs/conf/locale/__init__.pyi +++ b/django-stubs/conf/locale/__init__.pyi @@ -1,3 +1,3 @@ -from typing import Dict, Any +from typing import Any, Dict LANG_INFO: Dict[str, Any] = ... diff --git a/django-stubs/conf/urls/__init__.pyi b/django-stubs/conf/urls/__init__.pyi index 2ea5668..29a24ec 100644 --- a/django-stubs/conf/urls/__init__.pyi +++ b/django-stubs/conf/urls/__init__.pyi @@ -1,9 +1,8 @@ # Stubs for django.conf.urls (Python 3.5) -from typing import Any, Callable, Dict, Optional, overload, Sequence, Tuple, Union +from typing import Any, Callable, Dict, Optional, Sequence, Tuple, Union, overload from django.http.response import HttpResponse, HttpResponseBase - -from django.urls import URLResolver, URLPattern +from django.urls import URLPattern, URLResolver handler400: Union[str, Callable[..., HttpResponse]] = ... handler403: Union[str, Callable[..., HttpResponse]] = ... diff --git a/django-stubs/conf/urls/i18n.pyi b/django-stubs/conf/urls/i18n.pyi index 532cb7d..1eb49da 100644 --- a/django-stubs/conf/urls/i18n.pyi +++ b/django-stubs/conf/urls/i18n.pyi @@ -1,4 +1,4 @@ -from typing import Any, List, Tuple, Callable +from typing import Any, Callable, List, Tuple from django.urls.resolvers import URLPattern diff --git a/django-stubs/contrib/admin/__init__.pyi b/django-stubs/contrib/admin/__init__.pyi index b201e4a..65f6a53 100644 --- a/django-stubs/contrib/admin/__init__.pyi +++ b/django-stubs/contrib/admin/__init__.pyi @@ -1,25 +1,23 @@ -from .decorators import action as action, register as register -from .filters import ( - AllValuesFieldListFilter as AllValuesFieldListFilter, - BooleanFieldListFilter as BooleanFieldListFilter, - ChoicesFieldListFilter as ChoicesFieldListFilter, - DateFieldListFilter as DateFieldListFilter, - FieldListFilter as FieldListFilter, - ListFilter as ListFilter, - RelatedFieldListFilter as RelatedFieldListFilter, - RelatedOnlyFieldListFilter as RelatedOnlyFieldListFilter, - SimpleListFilter as SimpleListFilter, - EmptyFieldListFilter as EmptyFieldListFilter, -) -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 .sites import AdminSite as AdminSite, site as site from . import checks as checks +from .decorators import action as action +from .decorators import register as register +from .filters import AllValuesFieldListFilter as AllValuesFieldListFilter +from .filters import BooleanFieldListFilter as BooleanFieldListFilter +from .filters import ChoicesFieldListFilter as ChoicesFieldListFilter +from .filters import DateFieldListFilter as DateFieldListFilter +from .filters import EmptyFieldListFilter as EmptyFieldListFilter +from .filters import FieldListFilter as FieldListFilter +from .filters import ListFilter as ListFilter +from .filters import RelatedFieldListFilter as RelatedFieldListFilter +from .filters import RelatedOnlyFieldListFilter as RelatedOnlyFieldListFilter +from .filters import SimpleListFilter as SimpleListFilter +from .helpers import ACTION_CHECKBOX_NAME as ACTION_CHECKBOX_NAME +from .options import HORIZONTAL as HORIZONTAL +from .options import VERTICAL as VERTICAL +from .options import ModelAdmin as ModelAdmin +from .options import StackedInline as StackedInline +from .options import TabularInline as TabularInline +from .sites import AdminSite as AdminSite +from .sites import site as site def autodiscover() -> None: ... diff --git a/django-stubs/contrib/admin/checks.pyi b/django-stubs/contrib/admin/checks.pyi index 57f12b4..a638c73 100644 --- a/django-stubs/contrib/admin/checks.pyi +++ b/django-stubs/contrib/admin/checks.pyi @@ -1,10 +1,9 @@ from typing import Any, List, Optional, Sequence +from django.apps.config import AppConfig from django.contrib.admin.options import BaseModelAdmin from django.core.checks.messages import CheckMessage, Error -from django.apps.config import AppConfig - def check_admin_app(app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any) -> List[Error]: ... def check_dependencies(app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any) -> List[Error]: ... diff --git a/django-stubs/contrib/admin/decorators.pyi b/django-stubs/contrib/admin/decorators.pyi index c0fa9a7..86f694d 100644 --- a/django-stubs/contrib/admin/decorators.pyi +++ b/django-stubs/contrib/admin/decorators.pyi @@ -1,4 +1,4 @@ -from typing import Callable, Optional, Type, Sequence, Union, TypeVar, Any +from typing import Any, Callable, Optional, Sequence, Type, TypeVar, Union from django.contrib.admin import ModelAdmin from django.contrib.admin.sites import AdminSite diff --git a/django-stubs/contrib/admin/filters.pyi b/django-stubs/contrib/admin/filters.pyi index 2e1cbe0..2bf807f 100644 --- a/django-stubs/contrib/admin/filters.pyi +++ b/django-stubs/contrib/admin/filters.pyi @@ -1,13 +1,12 @@ -from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Iterator +from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Type from django.contrib.admin.options import ModelAdmin from django.core.handlers.wsgi import WSGIRequest from django.db.models.base import Model +from django.db.models.fields import Field from django.db.models.fields.related import RelatedField from django.db.models.query import QuerySet -from django.db.models.fields import Field - class ListFilter: title: Any = ... template: str = ... diff --git a/django-stubs/contrib/admin/helpers.pyi b/django-stubs/contrib/admin/helpers.pyi index 32d1433..45c917c 100644 --- a/django-stubs/contrib/admin/helpers.pyi +++ b/django-stubs/contrib/admin/helpers.pyi @@ -1,14 +1,13 @@ -from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Union, Iterable +from typing import Any, Callable, Dict, Iterable, Iterator, List, Optional, Tuple, Union +from django import forms +from django.db.models.fields import AutoField from django.forms.boundfield import BoundField from django.forms.forms import BaseForm from django.forms.utils import ErrorDict from django.forms.widgets import Media, Widget from django.utils.safestring import SafeText -from django import forms -from django.db.models.fields import AutoField - ACTION_CHECKBOX_NAME: str class ActionForm(forms.Form): diff --git a/django-stubs/contrib/admin/models.pyi b/django-stubs/contrib/admin/models.pyi index 05c033a..73b079b 100644 --- a/django-stubs/contrib/admin/models.pyi +++ b/django-stubs/contrib/admin/models.pyi @@ -2,9 +2,8 @@ from typing import Any, Optional, Union from uuid import UUID from django.contrib.contenttypes.models import ContentType -from django.db.models.base import Model - from django.db import models +from django.db.models.base import Model ADDITION: int CHANGE: int diff --git a/django-stubs/contrib/admin/options.pyi b/django-stubs/contrib/admin/options.pyi index 2095c4a..bff6d7f 100644 --- a/django-stubs/contrib/admin/options.pyi +++ b/django-stubs/contrib/admin/options.pyi @@ -6,20 +6,16 @@ from typing import ( Generic, Iterator, List, + Mapping, Optional, Sequence, Set, Tuple, Type, - Union, - Mapping, TypeVar, + Union, ) -from django.forms.forms import BaseForm -from django.forms.models import BaseInlineFormSet -from typing_extensions import Literal, TypedDict - from django.contrib.admin.filters import ListFilter from django.contrib.admin.models import LogEntry from django.contrib.admin.sites import AdminSite @@ -29,19 +25,20 @@ from django.contrib.contenttypes.models import ContentType from django.core.checks.messages import CheckMessage from django.core.paginator import Paginator from django.db.models.base import Model +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 TypedChoiceField -from django.forms.models import ModelChoiceField, ModelMultipleChoiceField +from django.forms.forms import BaseForm +from django.forms.models import BaseInlineFormSet, ModelChoiceField, ModelMultipleChoiceField from django.forms.widgets import Media from django.http.request import HttpRequest from django.http.response import HttpResponse, HttpResponseBase, HttpResponseRedirect, JsonResponse from django.template.response import TemplateResponse from django.urls.resolvers import URLPattern from django.utils.safestring import SafeText - -from django.db.models.fields import Field +from typing_extensions import Literal, TypedDict IS_POPUP_VAR: str TO_FIELD_VAR: str diff --git a/django-stubs/contrib/admin/sites.pyi b/django-stubs/contrib/admin/sites.pyi index 0feb34d..b051ef9 100644 --- a/django-stubs/contrib/admin/sites.pyi +++ b/django-stubs/contrib/admin/sites.pyi @@ -4,14 +4,14 @@ from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Type, U from django.apps.config import AppConfig from django.contrib.admin.options import ModelAdmin from django.contrib.auth.forms import AuthenticationForm +from django.core.checks import CheckMessage from django.core.handlers.wsgi import WSGIRequest from django.db.models.base import Model from django.db.models.query import QuerySet from django.http.response import HttpResponse from django.template.response import TemplateResponse -from django.urls import URLResolver, URLPattern +from django.urls import URLPattern, URLResolver from django.utils.functional import LazyObject -from django.core.checks import CheckMessage if sys.version_info >= (3, 9): from weakref import WeakSet diff --git a/django-stubs/contrib/admin/templatetags/admin_list.pyi b/django-stubs/contrib/admin/templatetags/admin_list.pyi index 8218f37..5444b14 100644 --- a/django-stubs/contrib/admin/templatetags/admin_list.pyi +++ b/django-stubs/contrib/admin/templatetags/admin_list.pyi @@ -1,4 +1,4 @@ -from typing import Any, Dict, Iterator, List, Optional, Union, Iterable +from typing import Any, Dict, Iterable, Iterator, List, Optional, Union from django.contrib.admin.filters import FieldListFilter from django.contrib.admin.templatetags.base import InclusionAdminNode diff --git a/django-stubs/contrib/admin/utils.pyi b/django-stubs/contrib/admin/utils.pyi index b127166..c52d6f6 100644 --- a/django-stubs/contrib/admin/utils.pyi +++ b/django-stubs/contrib/admin/utils.pyi @@ -9,13 +9,12 @@ from django.contrib.auth.forms import AdminPasswordChangeForm from django.core.handlers.wsgi import WSGIRequest from django.db.models.base import Model from django.db.models.deletion import Collector +from django.db.models.fields import Field, reverse_related from django.db.models.fields.reverse_related import ManyToOneRel from django.db.models.options import Options from django.db.models.query import QuerySet from django.forms.forms import BaseForm -from django.db.models.fields import Field, reverse_related - class FieldIsAForeignKeyColumnName(Exception): ... def lookup_needs_distinct(opts: Options, lookup_path: str) -> bool: ... diff --git a/django-stubs/contrib/admin/views/main.pyi b/django-stubs/contrib/admin/views/main.pyi index ad2deeb..23301f6 100644 --- a/django-stubs/contrib/admin/views/main.pyi +++ b/django-stubs/contrib/admin/views/main.pyi @@ -2,17 +2,14 @@ from collections import OrderedDict from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union from django.contrib.admin.filters import ListFilter, SimpleListFilter -from django.contrib.admin.options import ( # noqa: F401 - ModelAdmin, - IS_POPUP_VAR as IS_POPUP_VAR, - TO_FIELD_VAR as TO_FIELD_VAR, -) +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.core.handlers.wsgi import WSGIRequest from django.db.models.base import Model from django.db.models.expressions import Combinable, CombinedExpression, OrderBy -from django.db.models.query import QuerySet - from django.db.models.options import Options +from django.db.models.query import QuerySet from django.forms.formsets import BaseFormSet ALL_VAR: str diff --git a/django-stubs/contrib/admin/widgets.pyi b/django-stubs/contrib/admin/widgets.pyi index 7d7fe39..ef4727f 100644 --- a/django-stubs/contrib/admin/widgets.pyi +++ b/django-stubs/contrib/admin/widgets.pyi @@ -1,13 +1,12 @@ from typing import Any, Dict, Optional, Tuple, Union from uuid import UUID +from django import forms from django.contrib.admin.sites import AdminSite from django.db.models.fields.reverse_related import ForeignObjectRel, ManyToOneRel from django.forms.models import ModelChoiceIterator from django.forms.widgets import Media -from django import forms - class FilteredSelectMultiple(forms.SelectMultiple): @property def media(self) -> Media: ... diff --git a/django-stubs/contrib/admindocs/apps.pyi b/django-stubs/contrib/admindocs/apps.pyi index 4e2eccd..6150ebd 100644 --- a/django-stubs/contrib/admindocs/apps.pyi +++ b/django-stubs/contrib/admindocs/apps.pyi @@ -1,6 +1,7 @@ -from django.apps import AppConfig as AppConfig from typing import Any +from django.apps import AppConfig as AppConfig + class AdminDocsConfig(AppConfig): name: str = ... verbose_name: Any = ... diff --git a/django-stubs/contrib/auth/admin.pyi b/django-stubs/contrib/auth/admin.pyi index 69060d4..13b9deb 100644 --- a/django-stubs/contrib/auth/admin.pyi +++ b/django-stubs/contrib/auth/admin.pyi @@ -1,10 +1,9 @@ from typing import Any +from django.contrib import admin from django.core.handlers.wsgi import WSGIRequest from django.http.response import HttpResponse -from django.contrib import admin - csrf_protect_m: Any sensitive_post_parameters_m: Any diff --git a/django-stubs/contrib/auth/backends.pyi b/django-stubs/contrib/auth/backends.pyi index efad88d..74dcbba 100644 --- a/django-stubs/contrib/auth/backends.pyi +++ b/django-stubs/contrib/auth/backends.pyi @@ -1,8 +1,7 @@ from typing import Any, Optional, Set, Union from django.contrib.auth.base_user import AbstractBaseUser -from django.contrib.auth.models import AnonymousUser, User, Permission - +from django.contrib.auth.models import AnonymousUser, Permission, User from django.db.models.base import Model from django.http.request import HttpRequest diff --git a/django-stubs/contrib/auth/base_user.pyi b/django-stubs/contrib/auth/base_user.pyi index 4f3cee0..6659b23 100644 --- a/django-stubs/contrib/auth/base_user.pyi +++ b/django-stubs/contrib/auth/base_user.pyi @@ -1,10 +1,10 @@ import sys -from typing import Any, Optional, Tuple, List, overload, TypeVar, Union +from typing import Any, List, Optional, Tuple, TypeVar, Union, overload +from django.db import models from django.db.models.base import Model from django.db.models.expressions import Combinable from django.db.models.fields import BooleanField -from django.db import models if sys.version_info < (3, 8): from typing_extensions import Literal diff --git a/django-stubs/contrib/auth/checks.pyi b/django-stubs/contrib/auth/checks.pyi index 6006368..ae918e0 100644 --- a/django-stubs/contrib/auth/checks.pyi +++ b/django-stubs/contrib/auth/checks.pyi @@ -1,8 +1,7 @@ from typing import Any, List, Optional, Sequence -from django.core.checks.messages import CheckMessage - from django.apps.config import AppConfig +from django.core.checks.messages import CheckMessage def check_user_model(app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any) -> List[CheckMessage]: ... def check_models_permissions(app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any) -> List[CheckMessage]: ... diff --git a/django-stubs/contrib/auth/decorators.pyi b/django-stubs/contrib/auth/decorators.pyi index 3ecebe7..2f37898 100644 --- a/django-stubs/contrib/auth/decorators.pyi +++ b/django-stubs/contrib/auth/decorators.pyi @@ -1,9 +1,8 @@ -from typing import Callable, List, Optional, Set, Union, TypeVar, overload +from typing import Callable, List, Optional, Set, TypeVar, Union, overload from django.contrib.auth import REDIRECT_FIELD_NAME as REDIRECT_FIELD_NAME # noqa: F401 -from django.http.response import HttpResponseBase - from django.contrib.auth.models import AbstractUser +from django.http.response import HttpResponseBase _VIEW = TypeVar("_VIEW", bound=Callable[..., HttpResponseBase]) diff --git a/django-stubs/contrib/auth/forms.pyi b/django-stubs/contrib/auth/forms.pyi index 6271f45..f515df6 100644 --- a/django-stubs/contrib/auth/forms.pyi +++ b/django-stubs/contrib/auth/forms.pyi @@ -1,13 +1,12 @@ from typing import Any, Dict, Iterator, Optional +from django import forms from django.contrib.auth.base_user import AbstractBaseUser from django.contrib.auth.models import User from django.contrib.auth.tokens import PasswordResetTokenGenerator from django.core.exceptions import ValidationError from django.core.handlers.wsgi import WSGIRequest -from django import forms - UserModel: Any class ReadOnlyPasswordHashWidget(forms.Widget): diff --git a/django-stubs/contrib/auth/models.pyi b/django-stubs/contrib/auth/models.pyi index 11321ad..d907b46 100644 --- a/django-stubs/contrib/auth/models.pyi +++ b/django-stubs/contrib/auth/models.pyi @@ -2,14 +2,14 @@ import sys from typing import Any, Collection, Optional, Set, Tuple, Type, TypeVar, Union from django.contrib.auth.backends import ModelBackend -from django.contrib.auth.base_user import AbstractBaseUser as AbstractBaseUser, BaseUserManager as BaseUserManager +from django.contrib.auth.base_user import AbstractBaseUser as AbstractBaseUser +from django.contrib.auth.base_user import BaseUserManager as BaseUserManager from django.contrib.auth.validators import UnicodeUsernameValidator from django.contrib.contenttypes.models import ContentType +from django.db import models from django.db.models.base import Model from django.db.models.manager import EmptyManager -from django.db import models - if sys.version_info < (3, 8): from typing_extensions import Literal else: diff --git a/django-stubs/contrib/contenttypes/checks.pyi b/django-stubs/contrib/contenttypes/checks.pyi index e41f6ac..42dd7a2 100644 --- a/django-stubs/contrib/contenttypes/checks.pyi +++ b/django-stubs/contrib/contenttypes/checks.pyi @@ -1,8 +1,7 @@ from typing import Any, List, Optional, Sequence -from django.core.checks.messages import CheckMessage - from django.apps.config import AppConfig +from django.core.checks.messages import CheckMessage def check_generic_foreign_keys( app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any diff --git a/django-stubs/contrib/contenttypes/fields.pyi b/django-stubs/contrib/contenttypes/fields.pyi index 27b4219..f0b084f 100644 --- a/django-stubs/contrib/contenttypes/fields.pyi +++ b/django-stubs/contrib/contenttypes/fields.pyi @@ -4,6 +4,7 @@ from django.contrib.contenttypes.models import ContentType from django.core.checks.messages import CheckMessage from django.db.models.base import Model from django.db.models.expressions import Combinable +from django.db.models.fields import Field, PositiveIntegerField from django.db.models.fields.mixins import FieldCacheMixin from django.db.models.fields.related import ForeignObject from django.db.models.fields.related_descriptors import ReverseManyToOneDescriptor @@ -12,8 +13,6 @@ from django.db.models.query import QuerySet from django.db.models.query_utils import FilteredRelation, PathInfo from django.db.models.sql.where import WhereNode -from django.db.models.fields import Field, PositiveIntegerField - class GenericForeignKey(FieldCacheMixin): # django-stubs implementation only fields _pyi_private_set_type: Union[Any, Combinable] diff --git a/django-stubs/contrib/contenttypes/management/commands/remove_stale_contenttypes.pyi b/django-stubs/contrib/contenttypes/management/commands/remove_stale_contenttypes.pyi index d432030..94452c0 100644 --- a/django-stubs/contrib/contenttypes/management/commands/remove_stale_contenttypes.pyi +++ b/django-stubs/contrib/contenttypes/management/commands/remove_stale_contenttypes.pyi @@ -1,8 +1,7 @@ from typing import Any, Dict, List -from django.db.models.deletion import Collector - from django.core.management import BaseCommand +from django.db.models.deletion import Collector class Command(BaseCommand): ... diff --git a/django-stubs/contrib/flatpages/admin.pyi b/django-stubs/contrib/flatpages/admin.pyi index 4554252..a11f296 100644 --- a/django-stubs/contrib/flatpages/admin.pyi +++ b/django-stubs/contrib/flatpages/admin.pyi @@ -1,6 +1,7 @@ -from django.contrib import admin as admin from typing import Any +from django.contrib import admin as admin + class FlatPageAdmin(admin.ModelAdmin): form: Any = ... fieldsets: Any = ... diff --git a/django-stubs/contrib/flatpages/apps.pyi b/django-stubs/contrib/flatpages/apps.pyi index b195cbd..e3cd708 100644 --- a/django-stubs/contrib/flatpages/apps.pyi +++ b/django-stubs/contrib/flatpages/apps.pyi @@ -1,6 +1,7 @@ -from django.apps import AppConfig as AppConfig from typing import Any +from django.apps import AppConfig as AppConfig + class FlatPagesConfig(AppConfig): name: str = ... verbose_name: Any = ... diff --git a/django-stubs/contrib/flatpages/models.pyi b/django-stubs/contrib/flatpages/models.pyi index 330f3c7..d44cc9a 100644 --- a/django-stubs/contrib/flatpages/models.pyi +++ b/django-stubs/contrib/flatpages/models.pyi @@ -1,5 +1,4 @@ from django.contrib.sites.models import Site - from django.db import models class FlatPage(models.Model): diff --git a/django-stubs/contrib/gis/admin/__init__.pyi b/django-stubs/contrib/gis/admin/__init__.pyi index 352c847..a9b32c9 100644 --- a/django-stubs/contrib/gis/admin/__init__.pyi +++ b/django-stubs/contrib/gis/admin/__init__.pyi @@ -1,12 +1,11 @@ -from django.contrib.admin import ( - AdminSite as AdminSite, - HORIZONTAL as HORIZONTAL, - ModelAdmin as ModelAdmin, - StackedInline as StackedInline, - TabularInline as TabularInline, - VERTICAL as VERTICAL, - autodiscover as autodiscover, - register as register, - site as site, -) -from django.contrib.gis.admin.options import GeoModelAdmin as GeoModelAdmin, OSMGeoAdmin as OSMGeoAdmin +from django.contrib.admin import HORIZONTAL as HORIZONTAL +from django.contrib.admin import VERTICAL as VERTICAL +from django.contrib.admin import AdminSite as AdminSite +from django.contrib.admin import ModelAdmin as ModelAdmin +from django.contrib.admin import StackedInline as StackedInline +from django.contrib.admin import TabularInline as TabularInline +from django.contrib.admin import autodiscover as autodiscover +from django.contrib.admin import register as register +from django.contrib.admin import site as site +from django.contrib.gis.admin.options import GeoModelAdmin as GeoModelAdmin +from django.contrib.gis.admin.options import OSMGeoAdmin as OSMGeoAdmin diff --git a/django-stubs/contrib/gis/admin/options.pyi b/django-stubs/contrib/gis/admin/options.pyi index 915e220..8e06ffe 100644 --- a/django-stubs/contrib/gis/admin/options.pyi +++ b/django-stubs/contrib/gis/admin/options.pyi @@ -1,6 +1,7 @@ -from django.contrib.admin import ModelAdmin as ModelAdmin from typing import Any +from django.contrib.admin import ModelAdmin as ModelAdmin + spherical_mercator_srid: int class GeoModelAdmin(ModelAdmin): diff --git a/django-stubs/contrib/gis/admin/widgets.pyi b/django-stubs/contrib/gis/admin/widgets.pyi index 0e39eea..a1b3888 100644 --- a/django-stubs/contrib/gis/admin/widgets.pyi +++ b/django-stubs/contrib/gis/admin/widgets.pyi @@ -1,6 +1,7 @@ -from django.forms.widgets import Textarea as Textarea from typing import Any +from django.forms.widgets import Textarea as Textarea + geo_context: Any logger: Any diff --git a/django-stubs/contrib/gis/apps.pyi b/django-stubs/contrib/gis/apps.pyi index 12b6291..04ebc98 100644 --- a/django-stubs/contrib/gis/apps.pyi +++ b/django-stubs/contrib/gis/apps.pyi @@ -1,6 +1,7 @@ -from django.apps import AppConfig as AppConfig from typing import Any +from django.apps import AppConfig as AppConfig + class GISConfig(AppConfig): name: str = ... verbose_name: Any = ... diff --git a/django-stubs/contrib/gis/db/backends/mysql/base.pyi b/django-stubs/contrib/gis/db/backends/mysql/base.pyi index 9b8df98..0bbd97a 100644 --- a/django-stubs/contrib/gis/db/backends/mysql/base.pyi +++ b/django-stubs/contrib/gis/db/backends/mysql/base.pyi @@ -1,6 +1,7 @@ -from django.db.backends.mysql.base import DatabaseWrapper as MySQLDatabaseWrapper from typing import Any +from django.db.backends.mysql.base import DatabaseWrapper as MySQLDatabaseWrapper + class DatabaseWrapper(MySQLDatabaseWrapper): SchemaEditorClass: Any = ... features_class: Any = ... diff --git a/django-stubs/contrib/gis/db/backends/mysql/introspection.pyi b/django-stubs/contrib/gis/db/backends/mysql/introspection.pyi index a50e151..0eeda25 100644 --- a/django-stubs/contrib/gis/db/backends/mysql/introspection.pyi +++ b/django-stubs/contrib/gis/db/backends/mysql/introspection.pyi @@ -1,6 +1,7 @@ -from django.db.backends.mysql.introspection import DatabaseIntrospection as DatabaseIntrospection from typing import Any +from django.db.backends.mysql.introspection import DatabaseIntrospection as DatabaseIntrospection + class MySQLIntrospection(DatabaseIntrospection): data_types_reverse: Any = ... def get_geometry_type(self, table_name: Any, description: Any): ... diff --git a/django-stubs/contrib/gis/db/backends/mysql/operations.pyi b/django-stubs/contrib/gis/db/backends/mysql/operations.pyi index 45e7323..10c9f5e 100644 --- a/django-stubs/contrib/gis/db/backends/mysql/operations.pyi +++ b/django-stubs/contrib/gis/db/backends/mysql/operations.pyi @@ -1,6 +1,7 @@ +from typing import Any + from django.contrib.gis.db.backends.base.operations import BaseSpatialOperations as BaseSpatialOperations from django.db.backends.mysql.operations import DatabaseOperations as DatabaseOperations -from typing import Any class MySQLOperations(BaseSpatialOperations, DatabaseOperations): mysql: bool = ... diff --git a/django-stubs/contrib/gis/db/backends/mysql/schema.pyi b/django-stubs/contrib/gis/db/backends/mysql/schema.pyi index 49a5348..6cc782f 100644 --- a/django-stubs/contrib/gis/db/backends/mysql/schema.pyi +++ b/django-stubs/contrib/gis/db/backends/mysql/schema.pyi @@ -1,6 +1,7 @@ -from django.db.backends.mysql.schema import DatabaseSchemaEditor as DatabaseSchemaEditor from typing import Any +from django.db.backends.mysql.schema import DatabaseSchemaEditor as DatabaseSchemaEditor + logger: Any class MySQLGISSchemaEditor(DatabaseSchemaEditor): diff --git a/django-stubs/contrib/gis/db/backends/oracle/adapter.pyi b/django-stubs/contrib/gis/db/backends/oracle/adapter.pyi index f358f3c..86ebca7 100644 --- a/django-stubs/contrib/gis/db/backends/oracle/adapter.pyi +++ b/django-stubs/contrib/gis/db/backends/oracle/adapter.pyi @@ -1,6 +1,7 @@ -from django.contrib.gis.db.backends.base.adapter import WKTAdapter from typing import Any +from django.contrib.gis.db.backends.base.adapter import WKTAdapter + class OracleSpatialAdapter(WKTAdapter): input_size: Any = ... wkt: Any = ... diff --git a/django-stubs/contrib/gis/db/backends/oracle/base.pyi b/django-stubs/contrib/gis/db/backends/oracle/base.pyi index d0048b3..cc1e354 100644 --- a/django-stubs/contrib/gis/db/backends/oracle/base.pyi +++ b/django-stubs/contrib/gis/db/backends/oracle/base.pyi @@ -1,6 +1,7 @@ -from django.db.backends.oracle.base import DatabaseWrapper as OracleDatabaseWrapper from typing import Any +from django.db.backends.oracle.base import DatabaseWrapper as OracleDatabaseWrapper + class DatabaseWrapper(OracleDatabaseWrapper): SchemaEditorClass: Any = ... features_class: Any = ... diff --git a/django-stubs/contrib/gis/db/backends/oracle/introspection.pyi b/django-stubs/contrib/gis/db/backends/oracle/introspection.pyi index 389ba05..2c5fb8b 100644 --- a/django-stubs/contrib/gis/db/backends/oracle/introspection.pyi +++ b/django-stubs/contrib/gis/db/backends/oracle/introspection.pyi @@ -1,6 +1,7 @@ -from django.db.backends.oracle.introspection import DatabaseIntrospection as DatabaseIntrospection from typing import Any +from django.db.backends.oracle.introspection import DatabaseIntrospection as DatabaseIntrospection + class OracleIntrospection(DatabaseIntrospection): def data_types_reverse(self): ... def get_geometry_type(self, table_name: Any, description: Any): ... diff --git a/django-stubs/contrib/gis/db/backends/oracle/models.pyi b/django-stubs/contrib/gis/db/backends/oracle/models.pyi index 8949b3b..d81db05 100644 --- a/django-stubs/contrib/gis/db/backends/oracle/models.pyi +++ b/django-stubs/contrib/gis/db/backends/oracle/models.pyi @@ -1,6 +1,7 @@ +from typing import Any + from django.contrib.gis.db import models as models from django.contrib.gis.db.backends.base.models import SpatialRefSysMixin as SpatialRefSysMixin -from typing import Any class OracleGeometryColumns(models.Model): table_name: Any = ... diff --git a/django-stubs/contrib/gis/db/backends/oracle/operations.pyi b/django-stubs/contrib/gis/db/backends/oracle/operations.pyi index 6896230..d7f882a 100644 --- a/django-stubs/contrib/gis/db/backends/oracle/operations.pyi +++ b/django-stubs/contrib/gis/db/backends/oracle/operations.pyi @@ -1,7 +1,8 @@ +from typing import Any + from django.contrib.gis.db.backends.base.operations import BaseSpatialOperations as BaseSpatialOperations from django.contrib.gis.db.backends.utils import SpatialOperator as SpatialOperator from django.db.backends.oracle.operations import DatabaseOperations as DatabaseOperations -from typing import Any DEFAULT_TOLERANCE: str diff --git a/django-stubs/contrib/gis/db/backends/oracle/schema.pyi b/django-stubs/contrib/gis/db/backends/oracle/schema.pyi index dceb88a..d333685 100644 --- a/django-stubs/contrib/gis/db/backends/oracle/schema.pyi +++ b/django-stubs/contrib/gis/db/backends/oracle/schema.pyi @@ -1,6 +1,7 @@ -from django.db.backends.oracle.schema import DatabaseSchemaEditor from typing import Any +from django.db.backends.oracle.schema import DatabaseSchemaEditor + class OracleGISSchemaEditor(DatabaseSchemaEditor): sql_add_geometry_metadata: str = ... sql_add_spatial_index: str = ... diff --git a/django-stubs/contrib/gis/db/backends/postgis/base.pyi b/django-stubs/contrib/gis/db/backends/postgis/base.pyi index 0af8670..65110da 100644 --- a/django-stubs/contrib/gis/db/backends/postgis/base.pyi +++ b/django-stubs/contrib/gis/db/backends/postgis/base.pyi @@ -1,6 +1,7 @@ -from django.db.backends.postgresql.base import DatabaseWrapper as Psycopg2DatabaseWrapper from typing import Any +from django.db.backends.postgresql.base import DatabaseWrapper as Psycopg2DatabaseWrapper + class DatabaseWrapper(Psycopg2DatabaseWrapper): SchemaEditorClass: Any = ... features: Any = ... diff --git a/django-stubs/contrib/gis/db/backends/postgis/introspection.pyi b/django-stubs/contrib/gis/db/backends/postgis/introspection.pyi index 17880c8..5288832 100644 --- a/django-stubs/contrib/gis/db/backends/postgis/introspection.pyi +++ b/django-stubs/contrib/gis/db/backends/postgis/introspection.pyi @@ -1,6 +1,7 @@ -from django.db.backends.postgresql.introspection import DatabaseIntrospection as DatabaseIntrospection from typing import Any +from django.db.backends.postgresql.introspection import DatabaseIntrospection as DatabaseIntrospection + class PostGISIntrospection(DatabaseIntrospection): postgis_oid_lookup: Any = ... ignored_tables: Any = ... diff --git a/django-stubs/contrib/gis/db/backends/postgis/models.pyi b/django-stubs/contrib/gis/db/backends/postgis/models.pyi index 6bcfed0..b124dfa 100644 --- a/django-stubs/contrib/gis/db/backends/postgis/models.pyi +++ b/django-stubs/contrib/gis/db/backends/postgis/models.pyi @@ -1,6 +1,7 @@ +from typing import Any + from django.contrib.gis.db.backends.base.models import SpatialRefSysMixin as SpatialRefSysMixin from django.db import models as models -from typing import Any class PostGISGeometryColumns(models.Model): f_table_catalog: Any = ... diff --git a/django-stubs/contrib/gis/db/backends/postgis/operations.pyi b/django-stubs/contrib/gis/db/backends/postgis/operations.pyi index a7ec504..ea91472 100644 --- a/django-stubs/contrib/gis/db/backends/postgis/operations.pyi +++ b/django-stubs/contrib/gis/db/backends/postgis/operations.pyi @@ -1,8 +1,9 @@ +from typing import Any + from django.contrib.gis.db.backends.base.operations import BaseSpatialOperations from django.contrib.gis.db.backends.utils import SpatialOperator from django.db.backends.postgresql.operations import DatabaseOperations from django.db.models import Func -from typing import Any BILATERAL: str diff --git a/django-stubs/contrib/gis/db/backends/postgis/schema.pyi b/django-stubs/contrib/gis/db/backends/postgis/schema.pyi index 909f09b..58cdb98 100644 --- a/django-stubs/contrib/gis/db/backends/postgis/schema.pyi +++ b/django-stubs/contrib/gis/db/backends/postgis/schema.pyi @@ -1,6 +1,7 @@ -from django.db.backends.postgresql.schema import DatabaseSchemaEditor from typing import Any +from django.db.backends.postgresql.schema import DatabaseSchemaEditor + class PostGISSchemaEditor(DatabaseSchemaEditor): geom_index_type: str = ... geom_index_ops_nd: str = ... diff --git a/django-stubs/contrib/gis/db/backends/spatialite/adapter.pyi b/django-stubs/contrib/gis/db/backends/spatialite/adapter.pyi index ccffaaf..8405306 100644 --- a/django-stubs/contrib/gis/db/backends/spatialite/adapter.pyi +++ b/django-stubs/contrib/gis/db/backends/spatialite/adapter.pyi @@ -1,5 +1,6 @@ -from django.contrib.gis.db.backends.base.adapter import WKTAdapter as WKTAdapter from typing import Any +from django.contrib.gis.db.backends.base.adapter import WKTAdapter as WKTAdapter + class SpatiaLiteAdapter(WKTAdapter): def __conform__(self, protocol: Any): ... diff --git a/django-stubs/contrib/gis/db/backends/spatialite/base.pyi b/django-stubs/contrib/gis/db/backends/spatialite/base.pyi index edbcf67..6f13c4d 100644 --- a/django-stubs/contrib/gis/db/backends/spatialite/base.pyi +++ b/django-stubs/contrib/gis/db/backends/spatialite/base.pyi @@ -1,6 +1,7 @@ -from django.db.backends.sqlite3.base import DatabaseWrapper as SQLiteDatabaseWrapper from typing import Any +from django.db.backends.sqlite3.base import DatabaseWrapper as SQLiteDatabaseWrapper + class DatabaseWrapper(SQLiteDatabaseWrapper): SchemaEditorClass: Any = ... client_class: Any = ... diff --git a/django-stubs/contrib/gis/db/backends/spatialite/introspection.pyi b/django-stubs/contrib/gis/db/backends/spatialite/introspection.pyi index 298a6a1..e98c223 100644 --- a/django-stubs/contrib/gis/db/backends/spatialite/introspection.pyi +++ b/django-stubs/contrib/gis/db/backends/spatialite/introspection.pyi @@ -1,9 +1,8 @@ -from django.db.backends.sqlite3.introspection import ( - DatabaseIntrospection as DatabaseIntrospection, - FlexibleFieldLookupDict as FlexibleFieldLookupDict, -) from typing import Any +from django.db.backends.sqlite3.introspection import DatabaseIntrospection as DatabaseIntrospection +from django.db.backends.sqlite3.introspection import FlexibleFieldLookupDict as FlexibleFieldLookupDict + class GeoFlexibleFieldLookupDict(FlexibleFieldLookupDict): base_data_types_reverse: Any = ... diff --git a/django-stubs/contrib/gis/db/backends/spatialite/models.pyi b/django-stubs/contrib/gis/db/backends/spatialite/models.pyi index df16ae9..dc4fd60 100644 --- a/django-stubs/contrib/gis/db/backends/spatialite/models.pyi +++ b/django-stubs/contrib/gis/db/backends/spatialite/models.pyi @@ -1,6 +1,7 @@ +from typing import Any + from django.contrib.gis.db.backends.base.models import SpatialRefSysMixin as SpatialRefSysMixin from django.db import models as models -from typing import Any class SpatialiteGeometryColumns(models.Model): f_table_name: Any = ... diff --git a/django-stubs/contrib/gis/db/backends/spatialite/operations.pyi b/django-stubs/contrib/gis/db/backends/spatialite/operations.pyi index 4141b97..8728b8e 100644 --- a/django-stubs/contrib/gis/db/backends/spatialite/operations.pyi +++ b/django-stubs/contrib/gis/db/backends/spatialite/operations.pyi @@ -1,7 +1,8 @@ +from typing import Any + from django.contrib.gis.db.backends.base.operations import BaseSpatialOperations from django.contrib.gis.db.backends.utils import SpatialOperator as SpatialOperator from django.db.backends.sqlite3.operations import DatabaseOperations -from typing import Any class SpatialiteNullCheckOperator(SpatialOperator): def as_sql(self, connection: Any, lookup: Any, template_params: Any, sql_params: Any): ... diff --git a/django-stubs/contrib/gis/db/backends/spatialite/schema.pyi b/django-stubs/contrib/gis/db/backends/spatialite/schema.pyi index a4e81d4..361f2fb 100644 --- a/django-stubs/contrib/gis/db/backends/spatialite/schema.pyi +++ b/django-stubs/contrib/gis/db/backends/spatialite/schema.pyi @@ -1,6 +1,7 @@ -from django.db.backends.sqlite3.schema import DatabaseSchemaEditor as DatabaseSchemaEditor from typing import Any +from django.db.backends.sqlite3.schema import DatabaseSchemaEditor as DatabaseSchemaEditor + class SpatialiteSchemaEditor(DatabaseSchemaEditor): sql_add_geometry_column: str = ... sql_add_spatial_index: str = ... diff --git a/django-stubs/contrib/gis/db/models/__init__.pyi b/django-stubs/contrib/gis/db/models/__init__.pyi index 0966cda..47d6738 100644 --- a/django-stubs/contrib/gis/db/models/__init__.pyi +++ b/django-stubs/contrib/gis/db/models/__init__.pyi @@ -1,14 +1,12 @@ # noqa: F401 -from django.db.models import * from django.contrib.gis.db.models.aggregates import * -from django.contrib.gis.db.models.fields import ( - GeometryCollectionField as GeometryCollectionField, - GeometryField as GeometryField, - LineStringField as LineStringField, - MultiLineStringField as MultiLineStringField, - MultiPointField as MultiPointField, - MultiPolygonField as MultiPolygonField, - PointField as PointField, - PolygonField as PolygonField, - RasterField as RasterField, -) +from django.contrib.gis.db.models.fields import GeometryCollectionField as GeometryCollectionField +from django.contrib.gis.db.models.fields import GeometryField as GeometryField +from django.contrib.gis.db.models.fields import LineStringField as LineStringField +from django.contrib.gis.db.models.fields import MultiLineStringField as MultiLineStringField +from django.contrib.gis.db.models.fields import MultiPointField as MultiPointField +from django.contrib.gis.db.models.fields import MultiPolygonField as MultiPolygonField +from django.contrib.gis.db.models.fields import PointField as PointField +from django.contrib.gis.db.models.fields import PolygonField as PolygonField +from django.contrib.gis.db.models.fields import RasterField as RasterField +from django.db.models import * diff --git a/django-stubs/contrib/gis/db/models/aggregates.pyi b/django-stubs/contrib/gis/db/models/aggregates.pyi index 97524f7..3faf1ca 100644 --- a/django-stubs/contrib/gis/db/models/aggregates.pyi +++ b/django-stubs/contrib/gis/db/models/aggregates.pyi @@ -1,6 +1,7 @@ -from django.db.models import Aggregate from typing import Any, Optional +from django.db.models import Aggregate + class GeoAggregate(Aggregate): function: Any = ... is_extent: bool = ... diff --git a/django-stubs/contrib/gis/db/models/fields.pyi b/django-stubs/contrib/gis/db/models/fields.pyi index e7199ae..91cc3b3 100644 --- a/django-stubs/contrib/gis/db/models/fields.pyi +++ b/django-stubs/contrib/gis/db/models/fields.pyi @@ -1,4 +1,5 @@ -from typing import Any, Iterable, NamedTuple, Optional, TypeVar, Union, Tuple +from typing import Any, Iterable, NamedTuple, Optional, Tuple, TypeVar, Union + from django.db.models.fields import Field, _ErrorMessagesToOverride, _FieldChoices, _ValidatorCallable # __set__ value type diff --git a/django-stubs/contrib/gis/db/models/functions.pyi b/django-stubs/contrib/gis/db/models/functions.pyi index 8d0b840..9c3fde8 100644 --- a/django-stubs/contrib/gis/db/models/functions.pyi +++ b/django-stubs/contrib/gis/db/models/functions.pyi @@ -1,6 +1,8 @@ -from django.db.models import Func, Transform as StandardTransform from typing import Any, Optional +from django.db.models import Func +from django.db.models import Transform as StandardTransform + NUMERIC_TYPES: Any class GeoFuncMixin: diff --git a/django-stubs/contrib/gis/db/models/lookups.pyi b/django-stubs/contrib/gis/db/models/lookups.pyi index 7961019..0279423 100644 --- a/django-stubs/contrib/gis/db/models/lookups.pyi +++ b/django-stubs/contrib/gis/db/models/lookups.pyi @@ -1,6 +1,7 @@ -from django.db.models import Lookup, Transform from typing import Any +from django.db.models import Lookup, Transform + class RasterBandTransform(Transform): ... class GISLookup(Lookup): diff --git a/django-stubs/contrib/gis/db/models/proxy.pyi b/django-stubs/contrib/gis/db/models/proxy.pyi index 384d3c7..c817449 100644 --- a/django-stubs/contrib/gis/db/models/proxy.pyi +++ b/django-stubs/contrib/gis/db/models/proxy.pyi @@ -1,6 +1,7 @@ -from django.db.models.query_utils import DeferredAttribute from typing import Any, Optional +from django.db.models.query_utils import DeferredAttribute + class SpatialProxy(DeferredAttribute): def __init__(self, klass: Any, field: Any, load_func: Optional[Any] = ...) -> None: ... def __get__(self, instance: Any, cls: Optional[Any] = ...): ... diff --git a/django-stubs/contrib/gis/db/models/sql/conversion.pyi b/django-stubs/contrib/gis/db/models/sql/conversion.pyi index 4b612a2..87b4c6c 100644 --- a/django-stubs/contrib/gis/db/models/sql/conversion.pyi +++ b/django-stubs/contrib/gis/db/models/sql/conversion.pyi @@ -1,6 +1,7 @@ -from django.db import models as models from typing import Any +from django.db import models as models + class AreaField(models.FloatField): geo_field: Any = ... def __init__(self, geo_field: Any) -> None: ... diff --git a/django-stubs/contrib/gis/feeds.pyi b/django-stubs/contrib/gis/feeds.pyi index 863701f..91c36ed 100644 --- a/django-stubs/contrib/gis/feeds.pyi +++ b/django-stubs/contrib/gis/feeds.pyi @@ -1,6 +1,7 @@ +from typing import Any + from django.contrib.syndication.views import Feed as BaseFeed from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed -from typing import Any class GeoFeedMixin: def georss_coords(self, coords: Any): ... diff --git a/django-stubs/contrib/gis/forms/fields.pyi b/django-stubs/contrib/gis/forms/fields.pyi index b8b0449..8141faf 100644 --- a/django-stubs/contrib/gis/forms/fields.pyi +++ b/django-stubs/contrib/gis/forms/fields.pyi @@ -1,6 +1,7 @@ -from django import forms as forms from typing import Any, Optional +from django import forms as forms + class GeometryField(forms.Field): widget: Any = ... geom_type: str = ... diff --git a/django-stubs/contrib/gis/forms/widgets.pyi b/django-stubs/contrib/gis/forms/widgets.pyi index cd4eb4c..710a2bd 100644 --- a/django-stubs/contrib/gis/forms/widgets.pyi +++ b/django-stubs/contrib/gis/forms/widgets.pyi @@ -1,6 +1,7 @@ -from django.forms.widgets import Widget as Widget from typing import Any, Optional +from django.forms.widgets import Widget as Widget + logger: Any class BaseGeometryWidget(Widget): diff --git a/django-stubs/contrib/gis/gdal/__init__.pyi b/django-stubs/contrib/gis/gdal/__init__.pyi index 7658ce2..bc30d56 100644 --- a/django-stubs/contrib/gis/gdal/__init__.pyi +++ b/django-stubs/contrib/gis/gdal/__init__.pyi @@ -1,15 +1,9 @@ -from django.contrib.gis.gdal.error import ( - GDALException as GDALException, - SRSException as SRSException, - check_err as check_err, -) -from django.contrib.gis.gdal.libgdal import ( - GDAL_VERSION as GDAL_VERSION, - gdal_full_version as gdal_full_version, - gdal_version as gdal_version, -) -from django.contrib.gis.gdal.srs import ( - AxisOrder as AxisOrder, - CoordTransform as CoordTransform, - SpatialReference as SpatialReference, -) +from django.contrib.gis.gdal.error import GDALException as GDALException +from django.contrib.gis.gdal.error import SRSException as SRSException +from django.contrib.gis.gdal.error import check_err as check_err +from django.contrib.gis.gdal.libgdal import GDAL_VERSION as GDAL_VERSION +from django.contrib.gis.gdal.libgdal import gdal_full_version as gdal_full_version +from django.contrib.gis.gdal.libgdal import gdal_version as gdal_version +from django.contrib.gis.gdal.srs import AxisOrder as AxisOrder +from django.contrib.gis.gdal.srs import CoordTransform as CoordTransform +from django.contrib.gis.gdal.srs import SpatialReference as SpatialReference diff --git a/django-stubs/contrib/gis/gdal/base.pyi b/django-stubs/contrib/gis/gdal/base.pyi index 17dcc55..7cc8866 100644 --- a/django-stubs/contrib/gis/gdal/base.pyi +++ b/django-stubs/contrib/gis/gdal/base.pyi @@ -1,5 +1,6 @@ -from django.contrib.gis.ptr import CPointerBase as CPointerBase from typing import Any +from django.contrib.gis.ptr import CPointerBase as CPointerBase + class GDALBase(CPointerBase): null_ptr_exception_class: Any = ... diff --git a/django-stubs/contrib/gis/gdal/datasource.pyi b/django-stubs/contrib/gis/gdal/datasource.pyi index d48eede..dbbf22b 100644 --- a/django-stubs/contrib/gis/gdal/datasource.pyi +++ b/django-stubs/contrib/gis/gdal/datasource.pyi @@ -1,6 +1,7 @@ -from django.contrib.gis.gdal.base import GDALBase as GDALBase from typing import Any +from django.contrib.gis.gdal.base import GDALBase as GDALBase + class DataSource(GDALBase): destructor: Any = ... encoding: Any = ... diff --git a/django-stubs/contrib/gis/gdal/driver.pyi b/django-stubs/contrib/gis/gdal/driver.pyi index 6bb3edd..da635d0 100644 --- a/django-stubs/contrib/gis/gdal/driver.pyi +++ b/django-stubs/contrib/gis/gdal/driver.pyi @@ -1,6 +1,7 @@ -from django.contrib.gis.gdal.base import GDALBase as GDALBase from typing import Any +from django.contrib.gis.gdal.base import GDALBase as GDALBase + class Driver(GDALBase): ptr: Any = ... def __init__(self, dr_input: Any) -> None: ... diff --git a/django-stubs/contrib/gis/gdal/feature.pyi b/django-stubs/contrib/gis/gdal/feature.pyi index c8062f2..5fa1d2e 100644 --- a/django-stubs/contrib/gis/gdal/feature.pyi +++ b/django-stubs/contrib/gis/gdal/feature.pyi @@ -1,6 +1,7 @@ -from django.contrib.gis.gdal.base import GDALBase as GDALBase from typing import Any +from django.contrib.gis.gdal.base import GDALBase as GDALBase + class Feature(GDALBase): destructor: Any = ... ptr: Any = ... diff --git a/django-stubs/contrib/gis/gdal/field.pyi b/django-stubs/contrib/gis/gdal/field.pyi index 8b82540..2033a8e 100644 --- a/django-stubs/contrib/gis/gdal/field.pyi +++ b/django-stubs/contrib/gis/gdal/field.pyi @@ -1,6 +1,7 @@ -from django.contrib.gis.gdal.base import GDALBase as GDALBase from typing import Any +from django.contrib.gis.gdal.base import GDALBase as GDALBase + class Field(GDALBase): ptr: Any = ... __class__: Any = ... diff --git a/django-stubs/contrib/gis/gdal/geometries.pyi b/django-stubs/contrib/gis/gdal/geometries.pyi index 9d0d600..15e50f8 100644 --- a/django-stubs/contrib/gis/gdal/geometries.pyi +++ b/django-stubs/contrib/gis/gdal/geometries.pyi @@ -1,6 +1,7 @@ -from django.contrib.gis.gdal.base import GDALBase as GDALBase from typing import Any, Optional +from django.contrib.gis.gdal.base import GDALBase as GDALBase + class OGRGeometry(GDALBase): destructor: Any = ... ptr: Any = ... diff --git a/django-stubs/contrib/gis/gdal/layer.pyi b/django-stubs/contrib/gis/gdal/layer.pyi index 73f57f8..3cbc41c 100644 --- a/django-stubs/contrib/gis/gdal/layer.pyi +++ b/django-stubs/contrib/gis/gdal/layer.pyi @@ -1,6 +1,7 @@ -from django.contrib.gis.gdal.base import GDALBase as GDALBase from typing import Any +from django.contrib.gis.gdal.base import GDALBase as GDALBase + class Layer(GDALBase): ptr: Any = ... def __init__(self, layer_ptr: Any, ds: Any) -> None: ... diff --git a/django-stubs/contrib/gis/gdal/raster/band.pyi b/django-stubs/contrib/gis/gdal/raster/band.pyi index 26b2ecf..2bc9a76 100644 --- a/django-stubs/contrib/gis/gdal/raster/band.pyi +++ b/django-stubs/contrib/gis/gdal/raster/band.pyi @@ -1,6 +1,7 @@ -from django.contrib.gis.gdal.raster.base import GDALRasterBase as GDALRasterBase from typing import Any, Optional +from django.contrib.gis.gdal.raster.base import GDALRasterBase as GDALRasterBase + class GDALBand(GDALRasterBase): source: Any = ... def __init__(self, source: Any, index: Any) -> None: ... diff --git a/django-stubs/contrib/gis/gdal/raster/base.pyi b/django-stubs/contrib/gis/gdal/raster/base.pyi index d36a557..4b3fc5c 100644 --- a/django-stubs/contrib/gis/gdal/raster/base.pyi +++ b/django-stubs/contrib/gis/gdal/raster/base.pyi @@ -1,6 +1,7 @@ -from django.contrib.gis.gdal.base import GDALBase as GDALBase from typing import Any +from django.contrib.gis.gdal.base import GDALBase as GDALBase + class GDALRasterBase(GDALBase): @property def metadata(self): ... diff --git a/django-stubs/contrib/gis/gdal/raster/source.pyi b/django-stubs/contrib/gis/gdal/raster/source.pyi index 0da9238..3bc2af0 100644 --- a/django-stubs/contrib/gis/gdal/raster/source.pyi +++ b/django-stubs/contrib/gis/gdal/raster/source.pyi @@ -1,6 +1,7 @@ -from django.contrib.gis.gdal.raster.base import GDALRasterBase as GDALRasterBase from typing import Any, Optional +from django.contrib.gis.gdal.raster.base import GDALRasterBase as GDALRasterBase + class TransformPoint(list): indices: Any = ... def __init__(self, raster: Any, prop: Any) -> None: ... diff --git a/django-stubs/contrib/gis/gdal/srs.pyi b/django-stubs/contrib/gis/gdal/srs.pyi index e1112b6..fbc4f3b 100644 --- a/django-stubs/contrib/gis/gdal/srs.pyi +++ b/django-stubs/contrib/gis/gdal/srs.pyi @@ -1,7 +1,8 @@ -from django.contrib.gis.gdal.base import GDALBase as GDALBase from enum import IntEnum from typing import Any, Optional +from django.contrib.gis.gdal.base import GDALBase as GDALBase + class AxisOrder(IntEnum): TRADITIONAL: int = ... AUTHORITY: int = ... diff --git a/django-stubs/contrib/gis/geoip2/__init__.pyi b/django-stubs/contrib/gis/geoip2/__init__.pyi index b13c719..f524617 100644 --- a/django-stubs/contrib/gis/geoip2/__init__.pyi +++ b/django-stubs/contrib/gis/geoip2/__init__.pyi @@ -1,3 +1,4 @@ -from .base import GeoIP2 as GeoIP2, GeoIP2Exception as GeoIP2Exception +from .base import GeoIP2 as GeoIP2 +from .base import GeoIP2Exception as GeoIP2Exception HAS_GEOIP2: bool diff --git a/django-stubs/contrib/gis/geos/__init__.pyi b/django-stubs/contrib/gis/geos/__init__.pyi index 5b5a4cd..462c21f 100644 --- a/django-stubs/contrib/gis/geos/__init__.pyi +++ b/django-stubs/contrib/gis/geos/__init__.pyi @@ -1,12 +1,17 @@ -from .collections import ( - GeometryCollection as GeometryCollection, - MultiLineString as MultiLineString, - MultiPoint as MultiPoint, - MultiPolygon as MultiPolygon, -) -from .factory import fromfile as fromfile, fromstr as fromstr -from .geometry import GEOSGeometry as GEOSGeometry, hex_regex as hex_regex, wkt_regex as wkt_regex -from .io import WKBReader as WKBReader, WKBWriter as WKBWriter, WKTReader as WKTReader, WKTWriter as WKTWriter -from .linestring import LineString as LineString, LinearRing as LinearRing +from .collections import GeometryCollection as GeometryCollection +from .collections import MultiLineString as MultiLineString +from .collections import MultiPoint as MultiPoint +from .collections import MultiPolygon as MultiPolygon +from .factory import fromfile as fromfile +from .factory import fromstr as fromstr +from .geometry import GEOSGeometry as GEOSGeometry +from .geometry import hex_regex as hex_regex +from .geometry import wkt_regex as wkt_regex +from .io import WKBReader as WKBReader +from .io import WKBWriter as WKBWriter +from .io import WKTReader as WKTReader +from .io import WKTWriter as WKTWriter +from .linestring import LinearRing as LinearRing +from .linestring import LineString as LineString from .point import Point as Point from .polygon import Polygon as Polygon diff --git a/django-stubs/contrib/gis/geos/base.pyi b/django-stubs/contrib/gis/geos/base.pyi index 0042400..97b08ad 100644 --- a/django-stubs/contrib/gis/geos/base.pyi +++ b/django-stubs/contrib/gis/geos/base.pyi @@ -1,5 +1,6 @@ -from django.contrib.gis.ptr import CPointerBase as CPointerBase from typing import Any +from django.contrib.gis.ptr import CPointerBase as CPointerBase + class GEOSBase(CPointerBase): null_ptr_exception_class: Any = ... diff --git a/django-stubs/contrib/gis/geos/collections.pyi b/django-stubs/contrib/gis/geos/collections.pyi index 0f33cde..8bcb045 100644 --- a/django-stubs/contrib/gis/geos/collections.pyi +++ b/django-stubs/contrib/gis/geos/collections.pyi @@ -1,6 +1,8 @@ -from django.contrib.gis.geos.geometry import GEOSGeometry as GEOSGeometry, LinearGeometryMixin as LinearGeometryMixin from typing import Any +from django.contrib.gis.geos.geometry import GEOSGeometry as GEOSGeometry +from django.contrib.gis.geos.geometry import LinearGeometryMixin as LinearGeometryMixin + class GeometryCollection(GEOSGeometry): def __init__(self, *args: Any, **kwargs: Any) -> None: ... def __iter__(self) -> Any: ... diff --git a/django-stubs/contrib/gis/geos/coordseq.pyi b/django-stubs/contrib/gis/geos/coordseq.pyi index 16dfa12..69afc3d 100644 --- a/django-stubs/contrib/gis/geos/coordseq.pyi +++ b/django-stubs/contrib/gis/geos/coordseq.pyi @@ -1,6 +1,7 @@ -from django.contrib.gis.geos.base import GEOSBase as GEOSBase from typing import Any +from django.contrib.gis.geos.base import GEOSBase as GEOSBase + class GEOSCoordSeq(GEOSBase): ptr_type: Any = ... def __init__(self, ptr: Any, z: bool = ...) -> None: ... diff --git a/django-stubs/contrib/gis/geos/geometry.pyi b/django-stubs/contrib/gis/geos/geometry.pyi index 6f43628..9dc38b1 100644 --- a/django-stubs/contrib/gis/geos/geometry.pyi +++ b/django-stubs/contrib/gis/geos/geometry.pyi @@ -1,11 +1,10 @@ -from django.contrib.gis.geometry import ( # noqa: F401 - hex_regex as hex_regex, - json_regex as json_regex, - wkt_regex as wkt_regex, -) +from typing import Any, Optional + +from django.contrib.gis.geometry import hex_regex as hex_regex # noqa: F401 +from django.contrib.gis.geometry import json_regex as json_regex +from django.contrib.gis.geometry import wkt_regex as wkt_regex from django.contrib.gis.geos.base import GEOSBase as GEOSBase from django.contrib.gis.geos.mutable_list import ListMixin as ListMixin -from typing import Any, Optional class GEOSGeometryBase(GEOSBase): ptr_type: Any = ... diff --git a/django-stubs/contrib/gis/geos/io.pyi b/django-stubs/contrib/gis/geos/io.pyi index 78cdce3..a2e536d 100644 --- a/django-stubs/contrib/gis/geos/io.pyi +++ b/django-stubs/contrib/gis/geos/io.pyi @@ -1,11 +1,9 @@ -from django.contrib.gis.geos.prototypes.io import ( # noqa: F401 - WKBWriter as WKBWriter, - WKTWriter as WKTWriter, - _WKBReader, - _WKTReader, -) from typing import Any +from django.contrib.gis.geos.prototypes.io import WKBWriter as WKBWriter # noqa: F401 +from django.contrib.gis.geos.prototypes.io import WKTWriter as WKTWriter +from django.contrib.gis.geos.prototypes.io import _WKBReader, _WKTReader + class WKBReader(_WKBReader): def read(self, wkb: Any): ... diff --git a/django-stubs/contrib/gis/geos/linestring.pyi b/django-stubs/contrib/gis/geos/linestring.pyi index 5c85bbd..b9580b7 100644 --- a/django-stubs/contrib/gis/geos/linestring.pyi +++ b/django-stubs/contrib/gis/geos/linestring.pyi @@ -1,6 +1,8 @@ -from django.contrib.gis.geos.geometry import GEOSGeometry as GEOSGeometry, LinearGeometryMixin as LinearGeometryMixin from typing import Any +from django.contrib.gis.geos.geometry import GEOSGeometry as GEOSGeometry +from django.contrib.gis.geos.geometry import LinearGeometryMixin as LinearGeometryMixin + class LineString(LinearGeometryMixin, GEOSGeometry): has_cs: bool = ... def __init__(self, *args: Any, **kwargs: Any) -> None: ... diff --git a/django-stubs/contrib/gis/geos/point.pyi b/django-stubs/contrib/gis/geos/point.pyi index 3d8ce7a..1880a6d 100644 --- a/django-stubs/contrib/gis/geos/point.pyi +++ b/django-stubs/contrib/gis/geos/point.pyi @@ -1,6 +1,7 @@ -from django.contrib.gis.geos.geometry import GEOSGeometry as GEOSGeometry from typing import Any, Optional +from django.contrib.gis.geos.geometry import GEOSGeometry as GEOSGeometry + class Point(GEOSGeometry): has_cs: bool = ... def __init__( diff --git a/django-stubs/contrib/gis/geos/polygon.pyi b/django-stubs/contrib/gis/geos/polygon.pyi index e4086fb..d6aac49 100644 --- a/django-stubs/contrib/gis/geos/polygon.pyi +++ b/django-stubs/contrib/gis/geos/polygon.pyi @@ -1,6 +1,7 @@ -from django.contrib.gis.geos.geometry import GEOSGeometry as GEOSGeometry from typing import Any +from django.contrib.gis.geos.geometry import GEOSGeometry as GEOSGeometry + class Polygon(GEOSGeometry): def __init__(self, *args: Any, **kwargs: Any) -> None: ... def __iter__(self) -> Any: ... diff --git a/django-stubs/contrib/gis/geos/prepared.pyi b/django-stubs/contrib/gis/geos/prepared.pyi index 3043675..98f79da 100644 --- a/django-stubs/contrib/gis/geos/prepared.pyi +++ b/django-stubs/contrib/gis/geos/prepared.pyi @@ -1,6 +1,7 @@ -from .base import GEOSBase as GEOSBase from typing import Any +from .base import GEOSBase as GEOSBase + class PreparedGeometry(GEOSBase): ptr_type: Any = ... destructor: Any = ... diff --git a/django-stubs/contrib/gis/geos/prototypes/__init__.pyi b/django-stubs/contrib/gis/geos/prototypes/__init__.pyi index 06b16a9..eaae35d 100644 --- a/django-stubs/contrib/gis/geos/prototypes/__init__.pyi +++ b/django-stubs/contrib/gis/geos/prototypes/__init__.pyi @@ -1,57 +1,51 @@ -from django.contrib.gis.geos.prototypes.coordseq import ( - create_cs as create_cs, - cs_clone as cs_clone, - cs_getdims as cs_getdims, - cs_getordinate as cs_getordinate, - cs_getsize as cs_getsize, - cs_getx as cs_getx, - cs_gety as cs_gety, - cs_getz as cs_getz, - cs_is_ccw as cs_is_ccw, - cs_setordinate as cs_setordinate, - cs_setx as cs_setx, - cs_sety as cs_sety, - cs_setz as cs_setz, - get_cs as get_cs, -) -from django.contrib.gis.geos.prototypes.geom import ( - create_collection as create_collection, - create_empty_polygon as create_empty_polygon, - create_linearring as create_linearring, - create_linestring as create_linestring, - create_point as create_point, - create_polygon as create_polygon, - destroy_geom as destroy_geom, - geom_clone as geom_clone, - geos_get_srid as geos_get_srid, - geos_normalize as geos_normalize, - geos_set_srid as geos_set_srid, - geos_type as geos_type, - geos_typeid as geos_typeid, - get_dims as get_dims, - get_extring as get_extring, - get_geomn as get_geomn, - get_intring as get_intring, - get_nrings as get_nrings, - get_num_coords as get_num_coords, - get_num_geoms as get_num_geoms, -) -from django.contrib.gis.geos.prototypes.predicates import ( - geos_contains as geos_contains, - geos_covers as geos_covers, - geos_crosses as geos_crosses, - geos_disjoint as geos_disjoint, - geos_equals as geos_equals, - geos_equalsexact as geos_equalsexact, - geos_hasz as geos_hasz, - geos_intersects as geos_intersects, - geos_isclosed as geos_isclosed, - geos_isempty as geos_isempty, - geos_isring as geos_isring, - geos_issimple as geos_issimple, - geos_isvalid as geos_isvalid, - geos_overlaps as geos_overlaps, - geos_relatepattern as geos_relatepattern, - geos_touches as geos_touches, - geos_within as geos_within, -) +from django.contrib.gis.geos.prototypes.coordseq import create_cs as create_cs +from django.contrib.gis.geos.prototypes.coordseq import cs_clone as cs_clone +from django.contrib.gis.geos.prototypes.coordseq import cs_getdims as cs_getdims +from django.contrib.gis.geos.prototypes.coordseq import cs_getordinate as cs_getordinate +from django.contrib.gis.geos.prototypes.coordseq import cs_getsize as cs_getsize +from django.contrib.gis.geos.prototypes.coordseq import cs_getx as cs_getx +from django.contrib.gis.geos.prototypes.coordseq import cs_gety as cs_gety +from django.contrib.gis.geos.prototypes.coordseq import cs_getz as cs_getz +from django.contrib.gis.geos.prototypes.coordseq import cs_is_ccw as cs_is_ccw +from django.contrib.gis.geos.prototypes.coordseq import cs_setordinate as cs_setordinate +from django.contrib.gis.geos.prototypes.coordseq import cs_setx as cs_setx +from django.contrib.gis.geos.prototypes.coordseq import cs_sety as cs_sety +from django.contrib.gis.geos.prototypes.coordseq import cs_setz as cs_setz +from django.contrib.gis.geos.prototypes.coordseq import get_cs as get_cs +from django.contrib.gis.geos.prototypes.geom import create_collection as create_collection +from django.contrib.gis.geos.prototypes.geom import create_empty_polygon as create_empty_polygon +from django.contrib.gis.geos.prototypes.geom import create_linearring as create_linearring +from django.contrib.gis.geos.prototypes.geom import create_linestring as create_linestring +from django.contrib.gis.geos.prototypes.geom import create_point as create_point +from django.contrib.gis.geos.prototypes.geom import create_polygon as create_polygon +from django.contrib.gis.geos.prototypes.geom import destroy_geom as destroy_geom +from django.contrib.gis.geos.prototypes.geom import geom_clone as geom_clone +from django.contrib.gis.geos.prototypes.geom import geos_get_srid as geos_get_srid +from django.contrib.gis.geos.prototypes.geom import geos_normalize as geos_normalize +from django.contrib.gis.geos.prototypes.geom import geos_set_srid as geos_set_srid +from django.contrib.gis.geos.prototypes.geom import geos_type as geos_type +from django.contrib.gis.geos.prototypes.geom import geos_typeid as geos_typeid +from django.contrib.gis.geos.prototypes.geom import get_dims as get_dims +from django.contrib.gis.geos.prototypes.geom import get_extring as get_extring +from django.contrib.gis.geos.prototypes.geom import get_geomn as get_geomn +from django.contrib.gis.geos.prototypes.geom import get_intring as get_intring +from django.contrib.gis.geos.prototypes.geom import get_nrings as get_nrings +from django.contrib.gis.geos.prototypes.geom import get_num_coords as get_num_coords +from django.contrib.gis.geos.prototypes.geom import get_num_geoms as get_num_geoms +from django.contrib.gis.geos.prototypes.predicates import geos_contains as geos_contains +from django.contrib.gis.geos.prototypes.predicates import geos_covers as geos_covers +from django.contrib.gis.geos.prototypes.predicates import geos_crosses as geos_crosses +from django.contrib.gis.geos.prototypes.predicates import geos_disjoint as geos_disjoint +from django.contrib.gis.geos.prototypes.predicates import geos_equals as geos_equals +from django.contrib.gis.geos.prototypes.predicates import geos_equalsexact as geos_equalsexact +from django.contrib.gis.geos.prototypes.predicates import geos_hasz as geos_hasz +from django.contrib.gis.geos.prototypes.predicates import geos_intersects as geos_intersects +from django.contrib.gis.geos.prototypes.predicates import geos_isclosed as geos_isclosed +from django.contrib.gis.geos.prototypes.predicates import geos_isempty as geos_isempty +from django.contrib.gis.geos.prototypes.predicates import geos_isring as geos_isring +from django.contrib.gis.geos.prototypes.predicates import geos_issimple as geos_issimple +from django.contrib.gis.geos.prototypes.predicates import geos_isvalid as geos_isvalid +from django.contrib.gis.geos.prototypes.predicates import geos_overlaps as geos_overlaps +from django.contrib.gis.geos.prototypes.predicates import geos_relatepattern as geos_relatepattern +from django.contrib.gis.geos.prototypes.predicates import geos_touches as geos_touches +from django.contrib.gis.geos.prototypes.predicates import geos_within as geos_within diff --git a/django-stubs/contrib/gis/geos/prototypes/coordseq.pyi b/django-stubs/contrib/gis/geos/prototypes/coordseq.pyi index 36b48ae..9da8732 100644 --- a/django-stubs/contrib/gis/geos/prototypes/coordseq.pyi +++ b/django-stubs/contrib/gis/geos/prototypes/coordseq.pyi @@ -1,6 +1,7 @@ -from django.contrib.gis.geos.libgeos import GEOSFuncFactory as GEOSFuncFactory from typing import Any +from django.contrib.gis.geos.libgeos import GEOSFuncFactory as GEOSFuncFactory + def check_cs_op(result: Any, func: Any, cargs: Any): ... def check_cs_get(result: Any, func: Any, cargs: Any): ... diff --git a/django-stubs/contrib/gis/geos/prototypes/geom.pyi b/django-stubs/contrib/gis/geos/prototypes/geom.pyi index 249c1f6..969af76 100644 --- a/django-stubs/contrib/gis/geos/prototypes/geom.pyi +++ b/django-stubs/contrib/gis/geos/prototypes/geom.pyi @@ -1,7 +1,8 @@ from ctypes import c_char_p -from django.contrib.gis.geos.libgeos import GEOSFuncFactory as GEOSFuncFactory from typing import Any +from django.contrib.gis.geos.libgeos import GEOSFuncFactory as GEOSFuncFactory + c_uchar_p: Any class geos_char_p(c_char_p): ... diff --git a/django-stubs/contrib/gis/geos/prototypes/io.pyi b/django-stubs/contrib/gis/geos/prototypes/io.pyi index 1bf0000..12de4b5 100644 --- a/django-stubs/contrib/gis/geos/prototypes/io.pyi +++ b/django-stubs/contrib/gis/geos/prototypes/io.pyi @@ -1,11 +1,10 @@ import threading from ctypes import Structure -from django.contrib.gis.geos.base import GEOSBase as GEOSBase -from django.contrib.gis.geos.libgeos import ( - GEOSFuncFactory as GEOSFuncFactory, -) from typing import Any, Optional +from django.contrib.gis.geos.base import GEOSBase as GEOSBase +from django.contrib.gis.geos.libgeos import GEOSFuncFactory as GEOSFuncFactory + class WKTReader_st(Structure): ... class WKTWriter_st(Structure): ... class WKBReader_st(Structure): ... diff --git a/django-stubs/contrib/gis/geos/prototypes/misc.pyi b/django-stubs/contrib/gis/geos/prototypes/misc.pyi index 50edae3..64feec2 100644 --- a/django-stubs/contrib/gis/geos/prototypes/misc.pyi +++ b/django-stubs/contrib/gis/geos/prototypes/misc.pyi @@ -1,6 +1,7 @@ -from django.contrib.gis.geos.libgeos import GEOSFuncFactory from typing import Any +from django.contrib.gis.geos.libgeos import GEOSFuncFactory + class DblFromGeom(GEOSFuncFactory): restype: Any = ... errcheck: Any = ... diff --git a/django-stubs/contrib/gis/geos/prototypes/predicates.pyi b/django-stubs/contrib/gis/geos/prototypes/predicates.pyi index c3d743d..494f93b 100644 --- a/django-stubs/contrib/gis/geos/prototypes/predicates.pyi +++ b/django-stubs/contrib/gis/geos/prototypes/predicates.pyi @@ -1,6 +1,7 @@ -from django.contrib.gis.geos.libgeos import GEOSFuncFactory as GEOSFuncFactory from typing import Any +from django.contrib.gis.geos.libgeos import GEOSFuncFactory as GEOSFuncFactory + class UnaryPredicate(GEOSFuncFactory): argtypes: Any = ... restype: Any = ... diff --git a/django-stubs/contrib/gis/geos/prototypes/prepared.pyi b/django-stubs/contrib/gis/geos/prototypes/prepared.pyi index 5d73f83..413f8da 100644 --- a/django-stubs/contrib/gis/geos/prototypes/prepared.pyi +++ b/django-stubs/contrib/gis/geos/prototypes/prepared.pyi @@ -1,8 +1,7 @@ -from django.contrib.gis.geos.libgeos import ( - GEOSFuncFactory as GEOSFuncFactory, -) from typing import Any +from django.contrib.gis.geos.libgeos import GEOSFuncFactory as GEOSFuncFactory + geos_prepare: Any prepared_destroy: Any diff --git a/django-stubs/contrib/gis/geos/prototypes/threadsafe.pyi b/django-stubs/contrib/gis/geos/prototypes/threadsafe.pyi index 7c74072..e78ae7a 100644 --- a/django-stubs/contrib/gis/geos/prototypes/threadsafe.pyi +++ b/django-stubs/contrib/gis/geos/prototypes/threadsafe.pyi @@ -1,7 +1,8 @@ import threading -from django.contrib.gis.geos.base import GEOSBase as GEOSBase from typing import Any +from django.contrib.gis.geos.base import GEOSBase as GEOSBase + class GEOSContextHandle(GEOSBase): ptr_type: Any = ... destructor: Any = ... diff --git a/django-stubs/contrib/gis/geos/prototypes/topology.pyi b/django-stubs/contrib/gis/geos/prototypes/topology.pyi index c745d01..9b3c005 100644 --- a/django-stubs/contrib/gis/geos/prototypes/topology.pyi +++ b/django-stubs/contrib/gis/geos/prototypes/topology.pyi @@ -1,6 +1,7 @@ -from django.contrib.gis.geos.libgeos import GEOSFuncFactory as GEOSFuncFactory from typing import Any +from django.contrib.gis.geos.libgeos import GEOSFuncFactory as GEOSFuncFactory + class Topology(GEOSFuncFactory): argtypes: Any = ... restype: Any = ... diff --git a/django-stubs/contrib/gis/serializers/geojson.pyi b/django-stubs/contrib/gis/serializers/geojson.pyi index 63843eb..0982433 100644 --- a/django-stubs/contrib/gis/serializers/geojson.pyi +++ b/django-stubs/contrib/gis/serializers/geojson.pyi @@ -1,6 +1,7 @@ -from django.core.serializers.json import Serializer as JSONSerializer from typing import Any +from django.core.serializers.json import Serializer as JSONSerializer + class Serializer(JSONSerializer): def start_serialization(self) -> None: ... def end_serialization(self) -> None: ... diff --git a/django-stubs/contrib/gis/sitemaps/__init__.pyi b/django-stubs/contrib/gis/sitemaps/__init__.pyi index adf3282..3d41fca 100644 --- a/django-stubs/contrib/gis/sitemaps/__init__.pyi +++ b/django-stubs/contrib/gis/sitemaps/__init__.pyi @@ -1 +1,2 @@ -from django.contrib.gis.sitemaps.kml import KMLSitemap as KMLSitemap, KMZSitemap as KMZSitemap +from django.contrib.gis.sitemaps.kml import KMLSitemap as KMLSitemap +from django.contrib.gis.sitemaps.kml import KMZSitemap as KMZSitemap diff --git a/django-stubs/contrib/gis/sitemaps/kml.pyi b/django-stubs/contrib/gis/sitemaps/kml.pyi index 518c21c..cc61d61 100644 --- a/django-stubs/contrib/gis/sitemaps/kml.pyi +++ b/django-stubs/contrib/gis/sitemaps/kml.pyi @@ -1,6 +1,7 @@ -from django.contrib.sitemaps import Sitemap as Sitemap from typing import Any, Optional +from django.contrib.sitemaps import Sitemap as Sitemap + class KMLSitemap(Sitemap): geo_format: str = ... locations: Any = ... diff --git a/django-stubs/contrib/humanize/apps.pyi b/django-stubs/contrib/humanize/apps.pyi index 9f3cb27..ccc481b 100644 --- a/django-stubs/contrib/humanize/apps.pyi +++ b/django-stubs/contrib/humanize/apps.pyi @@ -1,6 +1,7 @@ -from django.apps import AppConfig as AppConfig from typing import Any +from django.apps import AppConfig as AppConfig + class HumanizeConfig(AppConfig): name: str = ... verbose_name: Any = ... diff --git a/django-stubs/contrib/humanize/templatetags/humanize.pyi b/django-stubs/contrib/humanize/templatetags/humanize.pyi index f701916..eb20268 100644 --- a/django-stubs/contrib/humanize/templatetags/humanize.pyi +++ b/django-stubs/contrib/humanize/templatetags/humanize.pyi @@ -1,5 +1,7 @@ -from datetime import date, datetime as datetime +from datetime import date +from datetime import datetime as datetime from typing import Any, Callable, Dict, Optional, SupportsInt, Tuple, Type, Union + from django import template register: template.Library diff --git a/django-stubs/contrib/messages/__init__.pyi b/django-stubs/contrib/messages/__init__.pyi index 1ff9c7d..e45e467 100644 --- a/django-stubs/contrib/messages/__init__.pyi +++ b/django-stubs/contrib/messages/__init__.pyi @@ -1,24 +1,19 @@ -from .api import ( - get_level as get_level, - set_level as set_level, - add_message as add_message, - debug as debug, - error as error, - success as success, - get_messages as get_messages, - MessageFailure as MessageFailure, - info as info, - warning as warning, -) - -from .constants import ( - DEBUG as DEBUG, - DEFAULT_LEVELS as DEFAULT_LEVELS, - DEFAULT_TAGS as DEFAULT_TAGS, - ERROR as ERROR, - INFO as INFO, - SUCCESS as SUCCESS, - WARNING as WARNING, -) +from .api import MessageFailure as MessageFailure +from .api import add_message as add_message +from .api import debug as debug +from .api import error as error +from .api import get_level as get_level +from .api import get_messages as get_messages +from .api import info as info +from .api import set_level as set_level +from .api import success as success +from .api import warning as warning +from .constants import DEBUG as DEBUG +from .constants import DEFAULT_LEVELS as DEFAULT_LEVELS +from .constants import DEFAULT_TAGS as DEFAULT_TAGS +from .constants import ERROR as ERROR +from .constants import INFO as INFO +from .constants import SUCCESS as SUCCESS +from .constants import WARNING as WARNING default_app_config: str = ... diff --git a/django-stubs/contrib/messages/apps.pyi b/django-stubs/contrib/messages/apps.pyi index 7823a7c..38cafb2 100644 --- a/django-stubs/contrib/messages/apps.pyi +++ b/django-stubs/contrib/messages/apps.pyi @@ -1,6 +1,7 @@ -from django.apps import AppConfig as AppConfig from typing import Any +from django.apps import AppConfig as AppConfig + class MessagesConfig(AppConfig): name: str = ... verbose_name: Any = ... diff --git a/django-stubs/contrib/postgres/aggregates/__init__.pyi b/django-stubs/contrib/postgres/aggregates/__init__.pyi index 8fad9ee..fbb15e1 100644 --- a/django-stubs/contrib/postgres/aggregates/__init__.pyi +++ b/django-stubs/contrib/postgres/aggregates/__init__.pyi @@ -1,24 +1,19 @@ -from .general import ( - ArrayAgg as ArrayAgg, - BitAnd as BitAnd, - BitOr as BitOr, - BoolAnd as BoolAnd, - BoolOr as BoolOr, - JSONBAgg as JSONBAgg, - StringAgg as StringAgg, -) - -from .statistics import ( - Corr as Corr, - CovarPop as CovarPop, - RegrAvgX as RegrAvgX, - RegrAvgY as RegrAvgY, - RegrCount as RegrCount, - RegrIntercept as RegrIntercept, - RegrR2 as RegrR2, - RegrSlope as RegrSlope, - RegrSXX as RegrSXX, - RegrSXY as RegrSXY, - RegrSYY as RegrSYY, - StatAggregate as StatAggregate, -) +from .general import ArrayAgg as ArrayAgg +from .general import BitAnd as BitAnd +from .general import BitOr as BitOr +from .general import BoolAnd as BoolAnd +from .general import BoolOr as BoolOr +from .general import JSONBAgg as JSONBAgg +from .general import StringAgg as StringAgg +from .statistics import Corr as Corr +from .statistics import CovarPop as CovarPop +from .statistics import RegrAvgX as RegrAvgX +from .statistics import RegrAvgY as RegrAvgY +from .statistics import RegrCount as RegrCount +from .statistics import RegrIntercept as RegrIntercept +from .statistics import RegrR2 as RegrR2 +from .statistics import RegrSlope as RegrSlope +from .statistics import RegrSXX as RegrSXX +from .statistics import RegrSXY as RegrSXY +from .statistics import RegrSYY as RegrSYY +from .statistics import StatAggregate as StatAggregate diff --git a/django-stubs/contrib/postgres/apps.pyi b/django-stubs/contrib/postgres/apps.pyi index f41db1b..11a06a9 100644 --- a/django-stubs/contrib/postgres/apps.pyi +++ b/django-stubs/contrib/postgres/apps.pyi @@ -1,6 +1,7 @@ -from django.apps import AppConfig as AppConfig from typing import Any +from django.apps import AppConfig as AppConfig + RANGE_TYPES: Any def uninstall_if_needed(setting: Any, value: Any, enter: Any, **kwargs: Any) -> None: ... diff --git a/django-stubs/contrib/postgres/fields/__init__.pyi b/django-stubs/contrib/postgres/fields/__init__.pyi index 6ad3e20..8725127 100644 --- a/django-stubs/contrib/postgres/fields/__init__.pyi +++ b/django-stubs/contrib/postgres/fields/__init__.pyi @@ -1,20 +1,17 @@ from .array import ArrayField as ArrayField -from .jsonb import JSONField as JSONField, JsonAdapter as JsonAdapter -from .ranges import ( - RangeField as RangeField, - IntegerRangeField as IntegerRangeField, - BigIntegerRangeField as BigIntegerRangeField, - DecimalRangeField as DecimalRangeField, - FloatRangeField as FloatRangeField, - DateRangeField as DateRangeField, - DateTimeRangeField as DateTimeRangeField, - RangeOperators as RangeOperators, - RangeBoundary as RangeBoundary, -) +from .citext import CICharField as CICharField +from .citext import CIEmailField as CIEmailField +from .citext import CIText as CIText +from .citext import CITextField as CITextField from .hstore import HStoreField as HStoreField -from .citext import ( - CICharField as CICharField, - CIEmailField as CIEmailField, - CIText as CIText, - CITextField as CITextField, -) +from .jsonb import JsonAdapter as JsonAdapter +from .jsonb import JSONField as JSONField +from .ranges import BigIntegerRangeField as BigIntegerRangeField +from .ranges import DateRangeField as DateRangeField +from .ranges import DateTimeRangeField as DateTimeRangeField +from .ranges import DecimalRangeField as DecimalRangeField +from .ranges import FloatRangeField as FloatRangeField +from .ranges import IntegerRangeField as IntegerRangeField +from .ranges import RangeBoundary as RangeBoundary +from .ranges import RangeField as RangeField +from .ranges import RangeOperators as RangeOperators diff --git a/django-stubs/contrib/postgres/fields/hstore.pyi b/django-stubs/contrib/postgres/fields/hstore.pyi index e94ea6a..96208db 100644 --- a/django-stubs/contrib/postgres/fields/hstore.pyi +++ b/django-stubs/contrib/postgres/fields/hstore.pyi @@ -1,6 +1,7 @@ from typing import Any from django.db.models import Field, Transform + from .mixins import CheckFieldDefaultMixin class HStoreField(CheckFieldDefaultMixin, Field): diff --git a/django-stubs/contrib/postgres/fields/jsonb.pyi b/django-stubs/contrib/postgres/fields/jsonb.pyi index 2959e16..15bd3bc 100644 --- a/django-stubs/contrib/postgres/fields/jsonb.pyi +++ b/django-stubs/contrib/postgres/fields/jsonb.pyi @@ -3,6 +3,7 @@ from typing import Any, Optional, Type from django.db.models import Field from django.db.models.lookups import Transform + from .mixins import CheckFieldDefaultMixin class JsonAdapter: diff --git a/django-stubs/contrib/postgres/fields/ranges.pyi b/django-stubs/contrib/postgres/fields/ranges.pyi index 7bf1e6e..7aadb51 100644 --- a/django-stubs/contrib/postgres/fields/ranges.pyi +++ b/django-stubs/contrib/postgres/fields/ranges.pyi @@ -1,7 +1,6 @@ from typing import Any from django.db import models - from psycopg2.extras import DateRange, DateTimeTZRange, NumericRange class RangeField(models.Field): diff --git a/django-stubs/contrib/postgres/indexes.pyi b/django-stubs/contrib/postgres/indexes.pyi index 135990d..2aee437 100644 --- a/django-stubs/contrib/postgres/indexes.pyi +++ b/django-stubs/contrib/postgres/indexes.pyi @@ -1,9 +1,8 @@ from typing import Optional, Sequence, Union -from django.db.models.query_utils import Q - -from django.db.models import Index, Func +from django.db.models import Func, Index from django.db.models.expressions import BaseExpression, Combinable +from django.db.models.query_utils import Q class PostgresIndex(Index): ... diff --git a/django-stubs/contrib/postgres/lookups.pyi b/django-stubs/contrib/postgres/lookups.pyi index 79c0a1b..bd855fa 100644 --- a/django-stubs/contrib/postgres/lookups.pyi +++ b/django-stubs/contrib/postgres/lookups.pyi @@ -1,6 +1,6 @@ +from django.db.models import Lookup, Transform from django.db.models.lookups import Exact -from django.db.models import Lookup, Transform from .search import SearchVectorExact class PostgresSimpleLookup(Lookup): diff --git a/django-stubs/contrib/postgres/search.pyi b/django-stubs/contrib/postgres/search.pyi index 69f522a..3cdeeff 100644 --- a/django-stubs/contrib/postgres/search.pyi +++ b/django-stubs/contrib/postgres/search.pyi @@ -1,10 +1,9 @@ from typing import Any, Dict, Optional, TypeVar, Union +from django.db.models import Field from django.db.models.expressions import Combinable, CombinedExpression, Func, Value, _OutputField from django.db.models.lookups import Lookup -from django.db.models import Field - _Expression = Union[str, Combinable, "SearchQueryCombinable"] class SearchVectorExact(Lookup): ... diff --git a/django-stubs/contrib/redirects/admin.pyi b/django-stubs/contrib/redirects/admin.pyi index bc50ad3..dc71b2d 100644 --- a/django-stubs/contrib/redirects/admin.pyi +++ b/django-stubs/contrib/redirects/admin.pyi @@ -1,6 +1,7 @@ -from django.contrib import admin as admin from typing import Any +from django.contrib import admin as admin + class RedirectAdmin(admin.ModelAdmin): list_display: Any = ... list_filter: Any = ... diff --git a/django-stubs/contrib/redirects/apps.pyi b/django-stubs/contrib/redirects/apps.pyi index db877f3..bb3a68d 100644 --- a/django-stubs/contrib/redirects/apps.pyi +++ b/django-stubs/contrib/redirects/apps.pyi @@ -1,6 +1,7 @@ -from django.apps import AppConfig as AppConfig from typing import Any +from django.apps import AppConfig as AppConfig + class RedirectsConfig(AppConfig): name: str = ... verbose_name: Any = ... diff --git a/django-stubs/contrib/sessions/apps.pyi b/django-stubs/contrib/sessions/apps.pyi index cd0625a..c65086a 100644 --- a/django-stubs/contrib/sessions/apps.pyi +++ b/django-stubs/contrib/sessions/apps.pyi @@ -1,6 +1,7 @@ -from django.apps import AppConfig as AppConfig from typing import Any +from django.apps import AppConfig as AppConfig + class SessionsConfig(AppConfig): name: str = ... verbose_name: Any = ... diff --git a/django-stubs/contrib/sessions/base_session.pyi b/django-stubs/contrib/sessions/base_session.pyi index 1578fa7..010e12e 100644 --- a/django-stubs/contrib/sessions/base_session.pyi +++ b/django-stubs/contrib/sessions/base_session.pyi @@ -2,7 +2,6 @@ from datetime import datetime from typing import Any, Dict, Optional, Type from django.contrib.sessions.backends.base import SessionBase - from django.db import models class BaseSessionManager(models.Manager): diff --git a/django-stubs/contrib/sitemaps/__init__.pyi b/django-stubs/contrib/sitemaps/__init__.pyi index 3ffc953..745c1ac 100644 --- a/django-stubs/contrib/sitemaps/__init__.pyi +++ b/django-stubs/contrib/sitemaps/__init__.pyi @@ -1,5 +1,5 @@ from datetime import datetime -from typing import Any, Dict, List, Optional, Union, Protocol +from typing import Any, Dict, List, Optional, Protocol, Union from django.contrib.sites.models import Site from django.contrib.sites.requests import RequestSite diff --git a/django-stubs/contrib/sitemaps/apps.pyi b/django-stubs/contrib/sitemaps/apps.pyi index 06b2b2d..72ab919 100644 --- a/django-stubs/contrib/sitemaps/apps.pyi +++ b/django-stubs/contrib/sitemaps/apps.pyi @@ -1,6 +1,7 @@ -from django.apps import AppConfig as AppConfig from typing import Any +from django.apps import AppConfig as AppConfig + class SiteMapsConfig(AppConfig): name: str = ... verbose_name: Any = ... diff --git a/django-stubs/contrib/sitemaps/views.pyi b/django-stubs/contrib/sitemaps/views.pyi index fb7a639..5245f76 100644 --- a/django-stubs/contrib/sitemaps/views.pyi +++ b/django-stubs/contrib/sitemaps/views.pyi @@ -1,11 +1,10 @@ from collections import OrderedDict from typing import Callable, Dict, Optional, Type, Union +from django.contrib.sitemaps import GenericSitemap, Sitemap from django.http.request import HttpRequest from django.template.response import TemplateResponse -from django.contrib.sitemaps import GenericSitemap, Sitemap - def x_robots_tag(func: Callable) -> Callable: ... def index( request: HttpRequest, diff --git a/django-stubs/contrib/sites/admin.pyi b/django-stubs/contrib/sites/admin.pyi index ab0de9a..c80181f 100644 --- a/django-stubs/contrib/sites/admin.pyi +++ b/django-stubs/contrib/sites/admin.pyi @@ -1,6 +1,7 @@ -from django.contrib import admin as admin from typing import Any +from django.contrib import admin as admin + class SiteAdmin(admin.ModelAdmin): list_display: Any = ... search_fields: Any = ... diff --git a/django-stubs/contrib/sites/models.pyi b/django-stubs/contrib/sites/models.pyi index 385c35d..099ab26 100644 --- a/django-stubs/contrib/sites/models.pyi +++ b/django-stubs/contrib/sites/models.pyi @@ -1,8 +1,7 @@ from typing import Any, Optional, Tuple, Type -from django.http.request import HttpRequest - from django.db import models +from django.http.request import HttpRequest SITE_CACHE: Any diff --git a/django-stubs/contrib/staticfiles/checks.pyi b/django-stubs/contrib/staticfiles/checks.pyi index 564e15b..3ce7e8c 100644 --- a/django-stubs/contrib/staticfiles/checks.pyi +++ b/django-stubs/contrib/staticfiles/checks.pyi @@ -1,7 +1,6 @@ from typing import Any, List, Optional, Sequence +from django.apps.config import AppConfig from django.core.checks.messages import Error -from django.apps.config import AppConfig - def check_finders(app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any) -> List[Error]: ... diff --git a/django-stubs/contrib/syndication/apps.pyi b/django-stubs/contrib/syndication/apps.pyi index 5a19845..0295711 100644 --- a/django-stubs/contrib/syndication/apps.pyi +++ b/django-stubs/contrib/syndication/apps.pyi @@ -1,6 +1,7 @@ -from django.apps import AppConfig as AppConfig from typing import Any +from django.apps import AppConfig as AppConfig + class SyndicationConfig(AppConfig): name: str = ... verbose_name: Any = ... diff --git a/django-stubs/core/cache/__init__.pyi b/django-stubs/core/cache/__init__.pyi index 7652696..f8c8c7b 100644 --- a/django-stubs/core/cache/__init__.pyi +++ b/django-stubs/core/cache/__init__.pyi @@ -1,11 +1,9 @@ from collections import OrderedDict from typing import Any, Callable, Dict, Union -from .backends.base import ( - BaseCache as BaseCache, - CacheKeyWarning as CacheKeyWarning, - InvalidCacheBackendError as InvalidCacheBackendError, -) +from .backends.base import BaseCache as BaseCache +from .backends.base import CacheKeyWarning as CacheKeyWarning +from .backends.base import InvalidCacheBackendError as InvalidCacheBackendError DEFAULT_CACHE_ALIAS: str diff --git a/django-stubs/core/checks/__init__.pyi b/django-stubs/core/checks/__init__.pyi index a41eed9..69626e9 100644 --- a/django-stubs/core/checks/__init__.pyi +++ b/django-stubs/core/checks/__init__.pyi @@ -1,17 +1,16 @@ -from .messages import ( - CheckMessage as CheckMessage, - Debug as Debug, - Info as Info, - Warning as Warning, - Error as Error, - Critical as Critical, - DEBUG as DEBUG, - INFO as INFO, - WARNING as WARNING, - ERROR as ERROR, - CRITICAL as CRITICAL, -) - -from .registry import register as register, run_checks as run_checks, tag_exists as tag_exists, Tags as Tags - from . import model_checks as model_checks +from .messages import CRITICAL as CRITICAL +from .messages import DEBUG as DEBUG +from .messages import ERROR as ERROR +from .messages import INFO as INFO +from .messages import WARNING as WARNING +from .messages import CheckMessage as CheckMessage +from .messages import Critical as Critical +from .messages import Debug as Debug +from .messages import Error as Error +from .messages import Info as Info +from .messages import Warning as Warning +from .registry import Tags as Tags +from .registry import register as register +from .registry import run_checks as run_checks +from .registry import tag_exists as tag_exists diff --git a/django-stubs/core/checks/async_checks.pyi b/django-stubs/core/checks/async_checks.pyi index 207442a..85a2614 100644 --- a/django-stubs/core/checks/async_checks.pyi +++ b/django-stubs/core/checks/async_checks.pyi @@ -1,8 +1,7 @@ from typing import Any, List, Optional, Sequence -from django.core.checks.messages import CheckMessage - from django.apps.config import AppConfig +from django.core.checks.messages import CheckMessage E001: Any diff --git a/django-stubs/core/checks/caches.pyi b/django-stubs/core/checks/caches.pyi index 3e07a1e..b912a8e 100644 --- a/django-stubs/core/checks/caches.pyi +++ b/django-stubs/core/checks/caches.pyi @@ -1,8 +1,7 @@ from typing import Any, List, Optional, Sequence -from django.core.checks.messages import Error - from django.apps.config import AppConfig +from django.core.checks.messages import Error E001: Any diff --git a/django-stubs/core/checks/model_checks.pyi b/django-stubs/core/checks/model_checks.pyi index 3a4d7dc..ec9418e 100644 --- a/django-stubs/core/checks/model_checks.pyi +++ b/django-stubs/core/checks/model_checks.pyi @@ -1,8 +1,7 @@ from typing import Any, List, Optional, Sequence -from django.core.checks.messages import CheckMessage, Warning - from django.apps.config import AppConfig +from django.core.checks.messages import CheckMessage, Warning def check_all_models(app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any) -> List[CheckMessage]: ... def check_lazy_references(app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any) -> List[CheckMessage]: ... diff --git a/django-stubs/core/checks/security/base.pyi b/django-stubs/core/checks/security/base.pyi index 8b9c37e..5ef74ae 100644 --- a/django-stubs/core/checks/security/base.pyi +++ b/django-stubs/core/checks/security/base.pyi @@ -1,8 +1,7 @@ from typing import Any, List, Optional, Sequence -from django.core.checks.messages import Warning - from django.apps.config import AppConfig +from django.core.checks.messages import Warning SECRET_KEY_MIN_LENGTH: int SECRET_KEY_MIN_UNIQUE_CHARACTERS: int diff --git a/django-stubs/core/checks/security/sessions.pyi b/django-stubs/core/checks/security/sessions.pyi index e3a7c18..0b4ee33 100644 --- a/django-stubs/core/checks/security/sessions.pyi +++ b/django-stubs/core/checks/security/sessions.pyi @@ -1,8 +1,7 @@ from typing import Any, List, Optional, Sequence -from django.core.checks.messages import Warning - from django.apps.config import AppConfig +from django.core.checks.messages import Warning def add_session_cookie_message(message: Any): ... diff --git a/django-stubs/core/checks/templates.pyi b/django-stubs/core/checks/templates.pyi index 698a575..17b2f8a 100644 --- a/django-stubs/core/checks/templates.pyi +++ b/django-stubs/core/checks/templates.pyi @@ -1,8 +1,7 @@ from typing import Any, List, Optional, Sequence -from django.core.checks.messages import Error - from django.apps.config import AppConfig +from django.core.checks.messages import Error E001: Any E002: Any diff --git a/django-stubs/core/checks/urls.pyi b/django-stubs/core/checks/urls.pyi index 76a27b7..eb48601 100644 --- a/django-stubs/core/checks/urls.pyi +++ b/django-stubs/core/checks/urls.pyi @@ -1,9 +1,8 @@ -from typing import Any, Callable, List, Tuple, Union, Optional, Sequence - -from django.core.checks.messages import CheckMessage, Error, Warning -from django.urls.resolvers import URLPattern, URLResolver +from typing import Any, Callable, List, Optional, Sequence, Tuple, Union from django.apps.config import AppConfig +from django.core.checks.messages import CheckMessage, Error, Warning +from django.urls.resolvers import URLPattern, URLResolver def check_url_config(app_configs: Optional[Sequence[AppConfig]] = ..., **kwargs: Any) -> List[CheckMessage]: ... def check_resolver(resolver: Union[Tuple[str, Callable], URLPattern, URLResolver]) -> List[CheckMessage]: ... diff --git a/django-stubs/core/files/base.pyi b/django-stubs/core/files/base.pyi index 9622685..c87b076 100644 --- a/django-stubs/core/files/base.pyi +++ b/django-stubs/core/files/base.pyi @@ -1,6 +1,6 @@ import types from io import StringIO -from typing import Any, IO, Iterator, Optional, Type, TypeVar, Union +from typing import IO, Any, Iterator, Optional, Type, TypeVar, Union from django.core.files.utils import FileProxyMixin diff --git a/django-stubs/core/files/images.pyi b/django-stubs/core/files/images.pyi index 3195698..eb810a7 100644 --- a/django-stubs/core/files/images.pyi +++ b/django-stubs/core/files/images.pyi @@ -1,4 +1,4 @@ -from typing import Any, IO, Union +from typing import IO, Any, Union from django.core.files import File diff --git a/django-stubs/core/files/storage.pyi b/django-stubs/core/files/storage.pyi index 1c15fb0..ae590cd 100644 --- a/django-stubs/core/files/storage.pyi +++ b/django-stubs/core/files/storage.pyi @@ -1,5 +1,5 @@ from datetime import datetime -from typing import Any, IO, List, Optional, Tuple, Type +from typing import IO, Any, List, Optional, Tuple, Type from django.core.files.base import File from django.utils.functional import LazyObject diff --git a/django-stubs/core/files/uploadedfile.pyi b/django-stubs/core/files/uploadedfile.pyi index 7ef7343..5ca12c7 100644 --- a/django-stubs/core/files/uploadedfile.pyi +++ b/django-stubs/core/files/uploadedfile.pyi @@ -1,4 +1,4 @@ -from typing import Any, Dict, IO, Optional, Union +from typing import IO, Any, Dict, Optional, Union from django.core.files.base import File diff --git a/django-stubs/core/files/uploadhandler.pyi b/django-stubs/core/files/uploadhandler.pyi index 1dfe863..d5c230e 100644 --- a/django-stubs/core/files/uploadhandler.pyi +++ b/django-stubs/core/files/uploadhandler.pyi @@ -1,7 +1,8 @@ # Stubs for django.core.files.uploadhandler (Python 3.5) -from typing import Any, Dict, IO, Optional, Tuple -from django.core.files.uploadedfile import UploadedFile, TemporaryUploadedFile +from typing import IO, Any, Dict, Optional, Tuple + +from django.core.files.uploadedfile import TemporaryUploadedFile, UploadedFile from django.http.request import HttpRequest, QueryDict from django.utils.datastructures import MultiValueDict diff --git a/django-stubs/core/handlers/asgi.pyi b/django-stubs/core/handlers/asgi.pyi index 255b021..38677d2 100644 --- a/django-stubs/core/handlers/asgi.pyi +++ b/django-stubs/core/handlers/asgi.pyi @@ -1,9 +1,8 @@ -from django.core.handlers import base as base -from django.http import ( - HttpRequest as HttpRequest, -) from typing import Any +from django.core.handlers import base as base +from django.http import HttpRequest as HttpRequest + logger: Any class ASGIRequest(HttpRequest): diff --git a/django-stubs/core/mail/__init__.pyi b/django-stubs/core/mail/__init__.pyi index 02e762e..efe2ad5 100644 --- a/django-stubs/core/mail/__init__.pyi +++ b/django-stubs/core/mail/__init__.pyi @@ -1,15 +1,14 @@ from typing import Any, List, Optional, Tuple -from .message import ( - BadHeaderError as BadHeaderError, - DEFAULT_ATTACHMENT_MIME_TYPE as DEFAULT_ATTACHMENT_MIME_TYPE, - EmailMessage as EmailMessage, - EmailMultiAlternatives as EmailMultiAlternatives, - SafeMIMEMultipart as SafeMIMEMultipart, - SafeMIMEText as SafeMIMEText, - forbid_multi_line_headers as forbid_multi_line_headers, -) -from .utils import CachedDnsName as CachedDnsName, DNS_NAME as DNS_NAME +from .message import DEFAULT_ATTACHMENT_MIME_TYPE as DEFAULT_ATTACHMENT_MIME_TYPE +from .message import BadHeaderError as BadHeaderError +from .message import EmailMessage as EmailMessage +from .message import EmailMultiAlternatives as EmailMultiAlternatives +from .message import SafeMIMEMultipart as SafeMIMEMultipart +from .message import SafeMIMEText as SafeMIMEText +from .message import forbid_multi_line_headers as forbid_multi_line_headers +from .utils import DNS_NAME as DNS_NAME +from .utils import CachedDnsName as CachedDnsName def get_connection(backend: Optional[str] = ..., fail_silently: bool = ..., **kwds: Any) -> Any: ... def send_mail( diff --git a/django-stubs/core/mail/backends/base.pyi b/django-stubs/core/mail/backends/base.pyi index 2e3fd0f..7aec2dd 100644 --- a/django-stubs/core/mail/backends/base.pyi +++ b/django-stubs/core/mail/backends/base.pyi @@ -1,5 +1,5 @@ import types -from typing import Any, TypeVar, Type, Iterable, Optional +from typing import Any, Iterable, Optional, Type, TypeVar from django.core.mail.message import EmailMessage diff --git a/django-stubs/core/management/__init__.pyi b/django-stubs/core/management/__init__.pyi index 2b5bef2..e67dd15 100644 --- a/django-stubs/core/management/__init__.pyi +++ b/django-stubs/core/management/__init__.pyi @@ -1,6 +1,7 @@ from typing import Any, Dict, List, Tuple, Union -from .base import BaseCommand as BaseCommand, CommandError as CommandError +from .base import BaseCommand as BaseCommand +from .base import CommandError as CommandError def find_commands(management_dir: str) -> List[str]: ... def load_command_class(app_name: str, name: str) -> BaseCommand: ... diff --git a/django-stubs/core/management/base.pyi b/django-stubs/core/management/base.pyi index 3e43642..6fe194c 100644 --- a/django-stubs/core/management/base.pyi +++ b/django-stubs/core/management/base.pyi @@ -1,10 +1,10 @@ from argparse import ArgumentParser, HelpFormatter, Namespace from io import StringIO, TextIOBase, TextIOWrapper -from typing import Any, Callable, List, Optional, Union, Tuple +from typing import Any, Callable, List, Optional, Tuple, Union from django.apps.config import AppConfig -from django.core.management.color import Style from django.core.checks import Tags +from django.core.management.color import Style class CommandError(Exception): ... class SystemCheckError(CommandError): ... diff --git a/django-stubs/core/management/commands/check.pyi b/django-stubs/core/management/commands/check.pyi index ff363ff..e50296d 100644 --- a/django-stubs/core/management/commands/check.pyi +++ b/django-stubs/core/management/commands/check.pyi @@ -1,8 +1,10 @@ +from typing import Any, List + from django.apps import apps as apps from django.core import checks as checks from django.core.checks.registry import registry as registry -from django.core.management.base import BaseCommand as BaseCommand, CommandError as CommandError -from typing import Any, List +from django.core.management.base import BaseCommand as BaseCommand +from django.core.management.base import CommandError as CommandError class Command(BaseCommand): def handle(self, *app_labels: List[str], **options: Any) -> None: ... diff --git a/django-stubs/core/management/commands/compilemessages.pyi b/django-stubs/core/management/commands/compilemessages.pyi index 64fd802..c5d035a 100644 --- a/django-stubs/core/management/commands/compilemessages.pyi +++ b/django-stubs/core/management/commands/compilemessages.pyi @@ -1,12 +1,12 @@ import os -from django.core.management.base import ( - BaseCommand as BaseCommand, - CommandError as CommandError, - CommandParser as CommandParser, -) -from django.core.management.utils import find_command as find_command, popen_wrapper as popen_wrapper from typing import List, Tuple, Union +from django.core.management.base import BaseCommand as BaseCommand +from django.core.management.base import CommandError as CommandError +from django.core.management.base import CommandParser as CommandParser +from django.core.management.utils import find_command as find_command +from django.core.management.utils import popen_wrapper as popen_wrapper + _PathType = Union[str, bytes, os.PathLike] def has_bom(fn: _PathType) -> bool: ... diff --git a/django-stubs/core/management/commands/createcachetable.pyi b/django-stubs/core/management/commands/createcachetable.pyi index e5ca53d..4c64f10 100644 --- a/django-stubs/core/management/commands/createcachetable.pyi +++ b/django-stubs/core/management/commands/createcachetable.pyi @@ -1,16 +1,16 @@ +from typing import Any, List + from django.conf import settings as settings from django.core.cache import caches as caches from django.core.cache.backends.db import BaseDatabaseCache as BaseDatabaseCache -from django.core.management.base import BaseCommand as BaseCommand, CommandError as CommandError -from django.db import ( - DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS, - DatabaseError as DatabaseError, - connections as connections, - models as models, - router as router, - transaction as transaction, -) -from typing import Any, List +from django.core.management.base import BaseCommand as BaseCommand +from django.core.management.base import CommandError as CommandError +from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS +from django.db import DatabaseError as DatabaseError +from django.db import connections as connections +from django.db import models as models +from django.db import router as router +from django.db import transaction as transaction class Command(BaseCommand): verbosity: int = ... diff --git a/django-stubs/core/management/commands/dbshell.pyi b/django-stubs/core/management/commands/dbshell.pyi index 7a1277e..7c1fbcc 100644 --- a/django-stubs/core/management/commands/dbshell.pyi +++ b/django-stubs/core/management/commands/dbshell.pyi @@ -1,8 +1,7 @@ -from django.core.management.base import ( - BaseCommand as BaseCommand, - CommandError as CommandError, - CommandParser as CommandParser, -) -from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS, connections as connections +from django.core.management.base import BaseCommand as BaseCommand +from django.core.management.base import CommandError as CommandError +from django.core.management.base import CommandParser as CommandParser +from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS +from django.db import connections as connections class Command(BaseCommand): ... diff --git a/django-stubs/core/management/commands/diffsettings.pyi b/django-stubs/core/management/commands/diffsettings.pyi index b5b2229..791352e 100644 --- a/django-stubs/core/management/commands/diffsettings.pyi +++ b/django-stubs/core/management/commands/diffsettings.pyi @@ -1,6 +1,7 @@ -from django.core.management.base import BaseCommand as BaseCommand from typing import Any, Callable, Dict, List +from django.core.management.base import BaseCommand as BaseCommand + def module_to_dict(module: Any, omittable: Callable[[str], bool] = ...) -> Dict[str, str]: ... class Command(BaseCommand): diff --git a/django-stubs/core/management/commands/flush.pyi b/django-stubs/core/management/commands/flush.pyi index 41f123d..d72f612 100644 --- a/django-stubs/core/management/commands/flush.pyi +++ b/django-stubs/core/management/commands/flush.pyi @@ -1,10 +1,15 @@ -from django.apps import apps as apps -from django.core.management.base import BaseCommand as BaseCommand, CommandError as CommandError -from django.core.management.color import Style, no_style as no_style -from django.core.management.sql import emit_post_migrate_signal as emit_post_migrate_signal, sql_flush as sql_flush -from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS, connections as connections from typing import Tuple +from django.apps import apps as apps +from django.core.management.base import BaseCommand as BaseCommand +from django.core.management.base import CommandError as CommandError +from django.core.management.color import Style +from django.core.management.color import no_style as no_style +from django.core.management.sql import emit_post_migrate_signal as emit_post_migrate_signal +from django.core.management.sql import sql_flush as sql_flush +from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS +from django.db import connections as connections + class Command(BaseCommand): stealth_options: Tuple[str] = ... style: Style = ... diff --git a/django-stubs/core/management/commands/inspectdb.pyi b/django-stubs/core/management/commands/inspectdb.pyi index 1777997..cb4f661 100644 --- a/django-stubs/core/management/commands/inspectdb.pyi +++ b/django-stubs/core/management/commands/inspectdb.pyi @@ -1,8 +1,11 @@ -from django.core.management.base import BaseCommand as BaseCommand, CommandError as CommandError -from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS, connections as connections +from typing import Any, Dict, Iterable, List, Tuple + +from django.core.management.base import BaseCommand as BaseCommand +from django.core.management.base import CommandError as CommandError +from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS +from django.db import connections as connections from django.db.backends.base.base import BaseDatabaseWrapper from django.db.models.constants import LOOKUP_SEP as LOOKUP_SEP -from typing import Any, Dict, Iterable, List, Tuple class Command(BaseCommand): stealth_options: Tuple[str] = ... diff --git a/django-stubs/core/management/commands/loaddata.pyi b/django-stubs/core/management/commands/loaddata.pyi index be9a963..509abed 100644 --- a/django-stubs/core/management/commands/loaddata.pyi +++ b/django-stubs/core/management/commands/loaddata.pyi @@ -1,5 +1,5 @@ import zipfile -from typing import List, Optional, Set, Sequence, Tuple, Type +from typing import List, Optional, Sequence, Set, Tuple, Type from django.apps.config import AppConfig from django.core.management.base import BaseCommand diff --git a/django-stubs/core/management/commands/makemigrations.pyi b/django-stubs/core/management/commands/makemigrations.pyi index d8390c5..46fbabe 100644 --- a/django-stubs/core/management/commands/makemigrations.pyi +++ b/django-stubs/core/management/commands/makemigrations.pyi @@ -1,28 +1,23 @@ +from typing import Any, Dict + from django.apps import apps as apps from django.conf import settings as settings -from django.core.management.base import ( - BaseCommand as BaseCommand, - CommandError as CommandError, - no_translations as no_translations, -) -from django.db import ( - DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS, - OperationalError as OperationalError, - connections as connections, - router as router, -) +from django.core.management.base import BaseCommand as BaseCommand +from django.core.management.base import CommandError as CommandError +from django.core.management.base import no_translations as no_translations +from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS +from django.db import OperationalError as OperationalError +from django.db import connections as connections +from django.db import router as router from django.db.migrations import Migration as Migration from django.db.migrations.autodetector import MigrationAutodetector as MigrationAutodetector from django.db.migrations.loader import MigrationLoader as MigrationLoader -from django.db.migrations.questioner import ( - InteractiveMigrationQuestioner as InteractiveMigrationQuestioner, - MigrationQuestioner as MigrationQuestioner, - NonInteractiveMigrationQuestioner as NonInteractiveMigrationQuestioner, -) +from django.db.migrations.questioner import InteractiveMigrationQuestioner as InteractiveMigrationQuestioner +from django.db.migrations.questioner import MigrationQuestioner as MigrationQuestioner +from django.db.migrations.questioner import NonInteractiveMigrationQuestioner as NonInteractiveMigrationQuestioner from django.db.migrations.state import ProjectState as ProjectState from django.db.migrations.utils import get_migration_name_timestamp as get_migration_name_timestamp from django.db.migrations.writer import MigrationWriter as MigrationWriter -from typing import Any, Dict class Command(BaseCommand): verbosity: int = ... diff --git a/django-stubs/core/management/commands/migrate.pyi b/django-stubs/core/management/commands/migrate.pyi index e0b709a..fa24686 100644 --- a/django-stubs/core/management/commands/migrate.pyi +++ b/django-stubs/core/management/commands/migrate.pyi @@ -1,23 +1,23 @@ +from typing import Any, List, Optional + from django.apps import apps as apps -from django.core.management.base import ( - BaseCommand as BaseCommand, - CommandError as CommandError, - no_translations as no_translations, -) -from django.core.management.sql import ( - emit_post_migrate_signal as emit_post_migrate_signal, - emit_pre_migrate_signal as emit_pre_migrate_signal, -) -from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS, connections as connections, router as router +from django.core.management.base import BaseCommand as BaseCommand +from django.core.management.base import CommandError as CommandError +from django.core.management.base import no_translations as no_translations +from django.core.management.sql import emit_post_migrate_signal as emit_post_migrate_signal +from django.core.management.sql import emit_pre_migrate_signal as emit_pre_migrate_signal +from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS +from django.db import connections as connections +from django.db import router as router from django.db.backends.base.base import BaseDatabaseWrapper from django.db.migrations.autodetector import MigrationAutodetector as MigrationAutodetector from django.db.migrations.executor import MigrationExecutor as MigrationExecutor from django.db.migrations.loader import AmbiguityError as AmbiguityError from django.db.migrations.operations.base import Operation -from django.db.migrations.state import ModelState as ModelState, ProjectState as ProjectState +from django.db.migrations.state import ModelState as ModelState +from django.db.migrations.state import ProjectState as ProjectState from django.utils.module_loading import module_has_submodule as module_has_submodule from django.utils.text import Truncator as Truncator -from typing import Any, List, Optional class Command(BaseCommand): verbosity: int = ... diff --git a/django-stubs/core/management/commands/sendtestemail.pyi b/django-stubs/core/management/commands/sendtestemail.pyi index 8e7058a..6cda8b1 100644 --- a/django-stubs/core/management/commands/sendtestemail.pyi +++ b/django-stubs/core/management/commands/sendtestemail.pyi @@ -1,4 +1,6 @@ -from django.core.mail import mail_admins as mail_admins, mail_managers as mail_managers, send_mail as send_mail +from django.core.mail import mail_admins as mail_admins +from django.core.mail import mail_managers as mail_managers +from django.core.mail import send_mail as send_mail from django.core.management.base import BaseCommand as BaseCommand from django.utils import timezone as timezone diff --git a/django-stubs/core/management/commands/shell.pyi b/django-stubs/core/management/commands/shell.pyi index 4fbb76b..73cced3 100644 --- a/django-stubs/core/management/commands/shell.pyi +++ b/django-stubs/core/management/commands/shell.pyi @@ -1,7 +1,9 @@ -from django.core.management import BaseCommand as BaseCommand, CommandError as CommandError -from django.utils.datastructures import OrderedSet as OrderedSet from typing import Any, List +from django.core.management import BaseCommand as BaseCommand +from django.core.management import CommandError as CommandError +from django.utils.datastructures import OrderedSet as OrderedSet + class Command(BaseCommand): shells: List[str] = ... def ipython(self, options: Any) -> None: ... diff --git a/django-stubs/core/management/commands/showmigrations.pyi b/django-stubs/core/management/commands/showmigrations.pyi index 17313df..b7a59b3 100644 --- a/django-stubs/core/management/commands/showmigrations.pyi +++ b/django-stubs/core/management/commands/showmigrations.pyi @@ -1,9 +1,11 @@ +from typing import Any, List, Optional + from django.apps import apps as apps from django.core.management.base import BaseCommand as BaseCommand -from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS, connections as connections +from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS +from django.db import connections as connections from django.db.backends.base.base import BaseDatabaseWrapper from django.db.migrations.loader import MigrationLoader as MigrationLoader -from typing import Any, List, Optional class Command(BaseCommand): verbosity: int = ... diff --git a/django-stubs/core/management/commands/sqlflush.pyi b/django-stubs/core/management/commands/sqlflush.pyi index 3d2b99c..74bbc7c 100644 --- a/django-stubs/core/management/commands/sqlflush.pyi +++ b/django-stubs/core/management/commands/sqlflush.pyi @@ -1,6 +1,7 @@ from django.core.management.base import BaseCommand as BaseCommand from django.core.management.sql import sql_flush as sql_flush -from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS, connections as connections +from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS +from django.db import connections as connections class Command(BaseCommand): output_transaction: bool = ... diff --git a/django-stubs/core/management/commands/sqlmigrate.pyi b/django-stubs/core/management/commands/sqlmigrate.pyi index 8223ce3..febeff5 100644 --- a/django-stubs/core/management/commands/sqlmigrate.pyi +++ b/django-stubs/core/management/commands/sqlmigrate.pyi @@ -1,9 +1,13 @@ -from django.apps import apps as apps -from django.core.management.base import BaseCommand as BaseCommand, CommandError as CommandError -from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS, connections as connections -from django.db.migrations.loader import AmbiguityError as AmbiguityError, MigrationLoader as MigrationLoader from typing import Any +from django.apps import apps as apps +from django.core.management.base import BaseCommand as BaseCommand +from django.core.management.base import CommandError as CommandError +from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS +from django.db import connections as connections +from django.db.migrations.loader import AmbiguityError as AmbiguityError +from django.db.migrations.loader import MigrationLoader as MigrationLoader + class Command(BaseCommand): output_transaction: bool = ... def execute(self, *args: Any, **options: Any): ... diff --git a/django-stubs/core/management/commands/sqlsequencereset.pyi b/django-stubs/core/management/commands/sqlsequencereset.pyi index 9ffc546..018ecf4 100644 --- a/django-stubs/core/management/commands/sqlsequencereset.pyi +++ b/django-stubs/core/management/commands/sqlsequencereset.pyi @@ -1,4 +1,5 @@ from django.core.management.base import AppCommand as AppCommand -from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS, connections as connections +from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS +from django.db import connections as connections class Command(AppCommand): ... diff --git a/django-stubs/core/management/commands/squashmigrations.pyi b/django-stubs/core/management/commands/squashmigrations.pyi index 27a81d6..b4b5157 100644 --- a/django-stubs/core/management/commands/squashmigrations.pyi +++ b/django-stubs/core/management/commands/squashmigrations.pyi @@ -1,9 +1,13 @@ from django.apps import apps as apps from django.conf import settings as settings -from django.core.management.base import BaseCommand as BaseCommand, CommandError as CommandError -from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS, connections as connections, migrations as migrations +from django.core.management.base import BaseCommand as BaseCommand +from django.core.management.base import CommandError as CommandError +from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS +from django.db import connections as connections +from django.db import migrations as migrations +from django.db.migrations.loader import AmbiguityError as AmbiguityError +from django.db.migrations.loader import MigrationLoader as MigrationLoader from django.db.migrations.migration import Migration -from django.db.migrations.loader import AmbiguityError as AmbiguityError, MigrationLoader as MigrationLoader from django.db.migrations.migration import SwappableTuple as SwappableTuple from django.db.migrations.optimizer import MigrationOptimizer as MigrationOptimizer from django.db.migrations.writer import MigrationWriter as MigrationWriter diff --git a/django-stubs/core/management/commands/startapp.pyi b/django-stubs/core/management/commands/startapp.pyi index 2c0b011..0bd549a 100644 --- a/django-stubs/core/management/commands/startapp.pyi +++ b/django-stubs/core/management/commands/startapp.pyi @@ -1,5 +1,6 @@ -from django.core.management.templates import TemplateCommand as TemplateCommand from typing import Any +from django.core.management.templates import TemplateCommand as TemplateCommand + class Command(TemplateCommand): missing_args_message: str = ... diff --git a/django-stubs/core/management/commands/startproject.pyi b/django-stubs/core/management/commands/startproject.pyi index 9adf946..9111c5e 100644 --- a/django-stubs/core/management/commands/startproject.pyi +++ b/django-stubs/core/management/commands/startproject.pyi @@ -1,5 +1,6 @@ -from ..utils import get_random_secret_key as get_random_secret_key from django.core.management.templates import TemplateCommand as TemplateCommand +from ..utils import get_random_secret_key as get_random_secret_key + class Command(TemplateCommand): missing_args_message: str = ... diff --git a/django-stubs/core/management/commands/test.pyi b/django-stubs/core/management/commands/test.pyi index da74c45..3849926 100644 --- a/django-stubs/core/management/commands/test.pyi +++ b/django-stubs/core/management/commands/test.pyi @@ -1,8 +1,9 @@ +from typing import Any + from django.conf import settings as settings from django.core.management.base import BaseCommand as BaseCommand from django.core.management.utils import get_command_line_option as get_command_line_option from django.test.utils import get_runner as get_runner -from typing import Any class Command(BaseCommand): test_runner: Any = ... diff --git a/django-stubs/core/serializers/__init__.pyi b/django-stubs/core/serializers/__init__.pyi index 35305be..91fbbc7 100644 --- a/django-stubs/core/serializers/__init__.pyi +++ b/django-stubs/core/serializers/__init__.pyi @@ -2,15 +2,13 @@ from typing import Any, Callable, Dict, Iterable, Iterator, List, Optional, Type from django.db.models.base import Model -from .base import ( - DeserializationError as DeserializationError, - DeserializedObject, - Deserializer as Deserializer, - M2MDeserializationError as M2MDeserializationError, - SerializationError as SerializationError, - Serializer as Serializer, - SerializerDoesNotExist as SerializerDoesNotExist, -) +from .base import DeserializationError as DeserializationError +from .base import DeserializedObject +from .base import Deserializer as Deserializer +from .base import M2MDeserializationError as M2MDeserializationError +from .base import SerializationError as SerializationError +from .base import Serializer as Serializer +from .base import SerializerDoesNotExist as SerializerDoesNotExist BUILTIN_SERIALIZERS: Any diff --git a/django-stubs/core/serializers/base.pyi b/django-stubs/core/serializers/base.pyi index a910132..dc4253a 100644 --- a/django-stubs/core/serializers/base.pyi +++ b/django-stubs/core/serializers/base.pyi @@ -1,13 +1,12 @@ from datetime import date from io import BufferedReader, StringIO, TextIOWrapper -from typing import Any, Dict, Iterable, List, Mapping, Optional, Type, Union, Collection +from typing import Any, Collection, Dict, Iterable, List, Mapping, Optional, Type, Union from uuid import UUID from django.core.management.base import OutputWrapper from django.db.models.base import Model -from django.db.models.fields.related import ForeignKey, ManyToManyField - from django.db.models.fields import Field +from django.db.models.fields.related import ForeignKey, ManyToManyField class SerializerDoesNotExist(KeyError): ... class SerializationError(Exception): ... diff --git a/django-stubs/core/serializers/python.pyi b/django-stubs/core/serializers/python.pyi index a348e49..1e55da4 100644 --- a/django-stubs/core/serializers/python.pyi +++ b/django-stubs/core/serializers/python.pyi @@ -1,11 +1,10 @@ from collections import OrderedDict from typing import Any, Dict, Iterator, List, Optional +from django.core.serializers import base from django.core.serializers.base import DeserializedObject from django.db.models.base import Model -from django.core.serializers import base - class Serializer(base.Serializer): objects: List[Any] = ... def get_dump_object(self, obj: Model) -> OrderedDict: ... diff --git a/django-stubs/core/serializers/pyyaml.pyi b/django-stubs/core/serializers/pyyaml.pyi index 8e084b7..0c88f3f 100644 --- a/django-stubs/core/serializers/pyyaml.pyi +++ b/django-stubs/core/serializers/pyyaml.pyi @@ -1,5 +1,6 @@ -from django.core.serializers.python import Serializer as PythonSerializer from typing import Any + +from django.core.serializers.python import Serializer as PythonSerializer from yaml import CSafeDumper as SafeDumper class DjangoSafeDumper(SafeDumper): diff --git a/django-stubs/core/serializers/xml_serializer.pyi b/django-stubs/core/serializers/xml_serializer.pyi index 336c406..f45f8c0 100644 --- a/django-stubs/core/serializers/xml_serializer.pyi +++ b/django-stubs/core/serializers/xml_serializer.pyi @@ -1,7 +1,8 @@ -from django.core.serializers import base as base from typing import Any from xml.sax.expatreader import ExpatParser as _ExpatParser +from django.core.serializers import base as base + class Serializer(base.Serializer): def indent(self, level: Any) -> None: ... xml: Any = ... diff --git a/django-stubs/core/servers/basehttp.pyi b/django-stubs/core/servers/basehttp.pyi index e16d5b8..15a0cae 100644 --- a/django-stubs/core/servers/basehttp.pyi +++ b/django-stubs/core/servers/basehttp.pyi @@ -3,7 +3,7 @@ from io import BytesIO from typing import Any, Dict from wsgiref import simple_server -from django.core.handlers.wsgi import WSGIRequest, WSGIHandler +from django.core.handlers.wsgi import WSGIHandler, WSGIRequest from django.core.wsgi import get_wsgi_application as get_wsgi_application # noqa: F401 class WSGIServer(simple_server.WSGIServer): diff --git a/django-stubs/db/__init__.pyi b/django-stubs/db/__init__.pyi index b823f1c..fcf81b6 100644 --- a/django-stubs/db/__init__.pyi +++ b/django-stubs/db/__init__.pyi @@ -1,25 +1,20 @@ from typing import Any -from .backends.base.base import BaseDatabaseWrapper -from .utils import ( - DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS, - DJANGO_VERSION_PICKLE_KEY as DJANGO_VERSION_PICKLE_KEY, - ProgrammingError as ProgrammingError, - IntegrityError as IntegrityError, - OperationalError as OperationalError, - DatabaseError as DatabaseError, - DataError as DataError, - NotSupportedError as NotSupportedError, - InternalError as InternalError, - InterfaceError as InterfaceError, - Error as Error, - ConnectionDoesNotExist as ConnectionDoesNotExist, - # Not exported in __all__ - ConnectionHandler, - ConnectionRouter, -) - from . import migrations +from .backends.base.base import BaseDatabaseWrapper +from .utils import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS # Not exported in __all__ +from .utils import DJANGO_VERSION_PICKLE_KEY as DJANGO_VERSION_PICKLE_KEY +from .utils import ConnectionDoesNotExist as ConnectionDoesNotExist +from .utils import ConnectionHandler, ConnectionRouter +from .utils import DatabaseError as DatabaseError +from .utils import DataError as DataError +from .utils import Error as Error +from .utils import IntegrityError as IntegrityError +from .utils import InterfaceError as InterfaceError +from .utils import InternalError as InternalError +from .utils import NotSupportedError as NotSupportedError +from .utils import OperationalError as OperationalError +from .utils import ProgrammingError as ProgrammingError connections: ConnectionHandler router: ConnectionRouter diff --git a/django-stubs/db/backends/base/base.pyi b/django-stubs/db/backends/base/base.pyi index 2bec936..233d828 100644 --- a/django-stubs/db/backends/base/base.pyi +++ b/django-stubs/db/backends/base/base.pyi @@ -3,17 +3,13 @@ from typing import Any, Callable, Dict, Iterator, List, Optional, Type, TypeVar from django.db.backends.base.client import BaseDatabaseClient from django.db.backends.base.creation import BaseDatabaseCreation +from django.db.backends.base.features import BaseDatabaseFeatures +from django.db.backends.base.introspection import BaseDatabaseIntrospection +from django.db.backends.base.operations import BaseDatabaseOperations +from django.db.backends.base.schema import BaseDatabaseSchemaEditor from django.db.backends.base.validation import BaseDatabaseValidation from django.db.backends.utils import CursorDebugWrapper, CursorWrapper -from django.db.backends.base.schema import BaseDatabaseSchemaEditor - -from django.db.backends.base.features import BaseDatabaseFeatures - -from django.db.backends.base.introspection import BaseDatabaseIntrospection - -from django.db.backends.base.operations import BaseDatabaseOperations - NO_DB_ALIAS: str _T = TypeVar("_T", bound="BaseDatabaseWrapper") diff --git a/django-stubs/db/backends/base/operations.pyi b/django-stubs/db/backends/base/operations.pyi index a1a2779..e290de3 100644 --- a/django-stubs/db/backends/base/operations.pyi +++ b/django-stubs/db/backends/base/operations.pyi @@ -1,4 +1,4 @@ -from datetime import date, datetime, timedelta, time +from datetime import date, datetime, time, timedelta from decimal import Decimal from typing import Any, List, Optional, Sequence, Tuple, Type, Union @@ -7,8 +7,8 @@ from django.db.backends.base.base import BaseDatabaseWrapper from django.db.backends.utils import CursorWrapper from django.db.models.base import Model from django.db.models.expressions import Case, Expression -from django.db.models.sql.compiler import SQLCompiler from django.db.models.fields import Field +from django.db.models.sql.compiler import SQLCompiler class BaseDatabaseOperations: compiler_module: str = ... diff --git a/django-stubs/db/backends/base/schema.pyi b/django-stubs/db/backends/base/schema.pyi index d4c0967..1a2d507 100644 --- a/django-stubs/db/backends/base/schema.pyi +++ b/django-stubs/db/backends/base/schema.pyi @@ -3,9 +3,8 @@ from typing import Any, ContextManager, List, Optional, Sequence, Tuple, Type, U from django.db.backends.base.base import BaseDatabaseWrapper from django.db.backends.ddl_references import Statement from django.db.models.base import Model -from django.db.models.indexes import Index - from django.db.models.fields import Field +from django.db.models.indexes import Index logger: Any diff --git a/django-stubs/db/backends/base/validation.pyi b/django-stubs/db/backends/base/validation.pyi index 706c19c..27fdd62 100644 --- a/django-stubs/db/backends/base/validation.pyi +++ b/django-stubs/db/backends/base/validation.pyi @@ -1,7 +1,6 @@ from typing import Any, List from django.db.backends.base.base import BaseDatabaseWrapper - from django.db.models.fields import Field class BaseDatabaseValidation: diff --git a/django-stubs/db/backends/ddl_references.pyi b/django-stubs/db/backends/ddl_references.pyi index 2d3f6af..8adda93 100644 --- a/django-stubs/db/backends/ddl_references.pyi +++ b/django-stubs/db/backends/ddl_references.pyi @@ -1,4 +1,4 @@ -from typing import Any, Callable, List, Tuple, Union, Dict +from typing import Any, Callable, Dict, List, Tuple, Union class Reference: def references_table(self, table: Any): ... diff --git a/django-stubs/db/backends/mysql/base.pyi b/django-stubs/db/backends/mysql/base.pyi index 75f2d4c..d86041d 100644 --- a/django-stubs/db/backends/mysql/base.pyi +++ b/django-stubs/db/backends/mysql/base.pyi @@ -1,6 +1,7 @@ -from django.db.backends.base.base import BaseDatabaseWrapper as BaseDatabaseWrapper from typing import Any, Optional +from django.db.backends.base.base import BaseDatabaseWrapper as BaseDatabaseWrapper + version: Any django_conversions: Any server_version_re: Any diff --git a/django-stubs/db/backends/mysql/compiler.pyi b/django-stubs/db/backends/mysql/compiler.pyi index 4799832..aa6e1e4 100644 --- a/django-stubs/db/backends/mysql/compiler.pyi +++ b/django-stubs/db/backends/mysql/compiler.pyi @@ -1,6 +1,7 @@ -from django.db.models.sql import compiler as compiler from typing import Any +from django.db.models.sql import compiler as compiler + class SQLCompiler(compiler.SQLCompiler): def as_subquery_condition(self, alias: Any, columns: Any, compiler: Any): ... diff --git a/django-stubs/db/backends/mysql/features.pyi b/django-stubs/db/backends/mysql/features.pyi index 0e16a57..bcc1ec0 100644 --- a/django-stubs/db/backends/mysql/features.pyi +++ b/django-stubs/db/backends/mysql/features.pyi @@ -1,6 +1,7 @@ -from django.db.backends.base.features import BaseDatabaseFeatures as BaseDatabaseFeatures from typing import Any +from django.db.backends.base.features import BaseDatabaseFeatures as BaseDatabaseFeatures + class DatabaseFeatures(BaseDatabaseFeatures): empty_fetchmany_value: Any = ... allows_group_by_pk: bool = ... diff --git a/django-stubs/db/backends/mysql/introspection.pyi b/django-stubs/db/backends/mysql/introspection.pyi index df3503f..6fbad79 100644 --- a/django-stubs/db/backends/mysql/introspection.pyi +++ b/django-stubs/db/backends/mysql/introspection.pyi @@ -1,7 +1,8 @@ from collections import namedtuple -from django.db.backends.base.introspection import BaseDatabaseIntrospection as BaseDatabaseIntrospection from typing import Any +from django.db.backends.base.introspection import BaseDatabaseIntrospection as BaseDatabaseIntrospection + FieldInfo: Any InfoLine = namedtuple("InfoLine", "col_name data_type max_len num_prec num_scale extra column_default is_unsigned") diff --git a/django-stubs/db/backends/mysql/operations.pyi b/django-stubs/db/backends/mysql/operations.pyi index a7712a8..6c82ad0 100644 --- a/django-stubs/db/backends/mysql/operations.pyi +++ b/django-stubs/db/backends/mysql/operations.pyi @@ -1,6 +1,7 @@ -from django.db.backends.base.operations import BaseDatabaseOperations as BaseDatabaseOperations from typing import Any, Optional +from django.db.backends.base.operations import BaseDatabaseOperations as BaseDatabaseOperations + class DatabaseOperations(BaseDatabaseOperations): compiler_module: str = ... integer_field_ranges: Any = ... diff --git a/django-stubs/db/backends/mysql/schema.pyi b/django-stubs/db/backends/mysql/schema.pyi index 1c89996..5f2a653 100644 --- a/django-stubs/db/backends/mysql/schema.pyi +++ b/django-stubs/db/backends/mysql/schema.pyi @@ -1,6 +1,7 @@ -from django.db.backends.base.schema import BaseDatabaseSchemaEditor as BaseDatabaseSchemaEditor from typing import Any +from django.db.backends.base.schema import BaseDatabaseSchemaEditor as BaseDatabaseSchemaEditor + class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): sql_rename_table: str = ... sql_alter_column_null: str = ... diff --git a/django-stubs/db/backends/mysql/validation.pyi b/django-stubs/db/backends/mysql/validation.pyi index e09243c..46de0b0 100644 --- a/django-stubs/db/backends/mysql/validation.pyi +++ b/django-stubs/db/backends/mysql/validation.pyi @@ -1,6 +1,7 @@ -from django.db.backends.base.validation import BaseDatabaseValidation as BaseDatabaseValidation from typing import Any +from django.db.backends.base.validation import BaseDatabaseValidation as BaseDatabaseValidation + class DatabaseValidation(BaseDatabaseValidation): def check(self, **kwargs: Any): ... def check_field_type(self, field: Any, field_type: Any): ... diff --git a/django-stubs/db/backends/oracle/base.pyi b/django-stubs/db/backends/oracle/base.pyi index 5d48e02..491fd34 100644 --- a/django-stubs/db/backends/oracle/base.pyi +++ b/django-stubs/db/backends/oracle/base.pyi @@ -1,6 +1,7 @@ -from django.db.backends.base.base import BaseDatabaseWrapper as BaseDatabaseWrapper from typing import Any, Optional +from django.db.backends.base.base import BaseDatabaseWrapper as BaseDatabaseWrapper + def wrap_oracle_errors() -> None: ... class _UninitializedOperatorsDescriptor: diff --git a/django-stubs/db/backends/oracle/creation.pyi b/django-stubs/db/backends/oracle/creation.pyi index 82cd3c5..cad7b3a 100644 --- a/django-stubs/db/backends/oracle/creation.pyi +++ b/django-stubs/db/backends/oracle/creation.pyi @@ -1,6 +1,7 @@ -from django.db.backends.base.creation import BaseDatabaseCreation as BaseDatabaseCreation from typing import Any +from django.db.backends.base.creation import BaseDatabaseCreation as BaseDatabaseCreation + TEST_DATABASE_PREFIX: str class DatabaseCreation(BaseDatabaseCreation): diff --git a/django-stubs/db/backends/oracle/features.pyi b/django-stubs/db/backends/oracle/features.pyi index 7954caf..7fbb5d1 100644 --- a/django-stubs/db/backends/oracle/features.pyi +++ b/django-stubs/db/backends/oracle/features.pyi @@ -1,6 +1,7 @@ -from django.db.backends.base.features import BaseDatabaseFeatures as BaseDatabaseFeatures from typing import Any +from django.db.backends.base.features import BaseDatabaseFeatures as BaseDatabaseFeatures + class DatabaseFeatures(BaseDatabaseFeatures): interprets_empty_strings_as_nulls: bool = ... has_select_for_update: bool = ... diff --git a/django-stubs/db/backends/oracle/functions.pyi b/django-stubs/db/backends/oracle/functions.pyi index 3c9035f..b536868 100644 --- a/django-stubs/db/backends/oracle/functions.pyi +++ b/django-stubs/db/backends/oracle/functions.pyi @@ -1,6 +1,7 @@ -from django.db.models import Func as Func from typing import Any, Optional +from django.db.models import Func as Func + class IntervalToSeconds(Func): function: str = ... template: str = ... diff --git a/django-stubs/db/backends/oracle/introspection.pyi b/django-stubs/db/backends/oracle/introspection.pyi index 9599883..b8fce81 100644 --- a/django-stubs/db/backends/oracle/introspection.pyi +++ b/django-stubs/db/backends/oracle/introspection.pyi @@ -1,6 +1,7 @@ -from django.db.backends.base.introspection import BaseDatabaseIntrospection as BaseDatabaseIntrospection from typing import Any +from django.db.backends.base.introspection import BaseDatabaseIntrospection as BaseDatabaseIntrospection + FieldInfo: Any class DatabaseIntrospection(BaseDatabaseIntrospection): diff --git a/django-stubs/db/backends/oracle/operations.pyi b/django-stubs/db/backends/oracle/operations.pyi index 345e3ec..dacd962 100644 --- a/django-stubs/db/backends/oracle/operations.pyi +++ b/django-stubs/db/backends/oracle/operations.pyi @@ -1,6 +1,7 @@ -from django.db.backends.base.operations import BaseDatabaseOperations as BaseDatabaseOperations from typing import Any, Optional +from django.db.backends.base.operations import BaseDatabaseOperations as BaseDatabaseOperations + class DatabaseOperations(BaseDatabaseOperations): integer_field_ranges: Any = ... set_operators: Any = ... diff --git a/django-stubs/db/backends/oracle/schema.pyi b/django-stubs/db/backends/oracle/schema.pyi index d2df8ef..80dbef5 100644 --- a/django-stubs/db/backends/oracle/schema.pyi +++ b/django-stubs/db/backends/oracle/schema.pyi @@ -1,6 +1,7 @@ -from django.db.backends.base.schema import BaseDatabaseSchemaEditor as BaseDatabaseSchemaEditor from typing import Any +from django.db.backends.base.schema import BaseDatabaseSchemaEditor as BaseDatabaseSchemaEditor + class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): sql_create_column: str = ... sql_alter_column_type: str = ... diff --git a/django-stubs/db/backends/oracle/validation.pyi b/django-stubs/db/backends/oracle/validation.pyi index 13abec7..2f7d6c4 100644 --- a/django-stubs/db/backends/oracle/validation.pyi +++ b/django-stubs/db/backends/oracle/validation.pyi @@ -1,5 +1,6 @@ -from django.db.backends.base.validation import BaseDatabaseValidation as BaseDatabaseValidation from typing import Any +from django.db.backends.base.validation import BaseDatabaseValidation as BaseDatabaseValidation + class DatabaseValidation(BaseDatabaseValidation): def check_field_type(self, field: Any, field_type: Any): ... diff --git a/django-stubs/db/backends/postgresql/features.pyi b/django-stubs/db/backends/postgresql/features.pyi index 5604588..06c3519 100644 --- a/django-stubs/db/backends/postgresql/features.pyi +++ b/django-stubs/db/backends/postgresql/features.pyi @@ -1,6 +1,7 @@ -from django.db.backends.base.features import BaseDatabaseFeatures as BaseDatabaseFeatures from typing import Any +from django.db.backends.base.features import BaseDatabaseFeatures as BaseDatabaseFeatures + class DatabaseFeatures(BaseDatabaseFeatures): allows_group_by_selected_pks: bool = ... can_return_columns_from_insert: bool = ... diff --git a/django-stubs/db/backends/postgresql/introspection.pyi b/django-stubs/db/backends/postgresql/introspection.pyi index 4636889..71ab83e 100644 --- a/django-stubs/db/backends/postgresql/introspection.pyi +++ b/django-stubs/db/backends/postgresql/introspection.pyi @@ -1,6 +1,7 @@ -from django.db.backends.base.introspection import BaseDatabaseIntrospection as BaseDatabaseIntrospection from typing import Any +from django.db.backends.base.introspection import BaseDatabaseIntrospection as BaseDatabaseIntrospection + class DatabaseIntrospection(BaseDatabaseIntrospection): data_types_reverse: Any = ... ignored_tables: Any = ... diff --git a/django-stubs/db/backends/postgresql/schema.pyi b/django-stubs/db/backends/postgresql/schema.pyi index 3c8e1c2..8514711 100644 --- a/django-stubs/db/backends/postgresql/schema.pyi +++ b/django-stubs/db/backends/postgresql/schema.pyi @@ -1,6 +1,7 @@ -from django.db.backends.base.schema import BaseDatabaseSchemaEditor as BaseDatabaseSchemaEditor from typing import Any +from django.db.backends.base.schema import BaseDatabaseSchemaEditor as BaseDatabaseSchemaEditor + class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): sql_create_sequence: str = ... sql_delete_sequence: str = ... diff --git a/django-stubs/db/backends/utils.pyi b/django-stubs/db/backends/utils.pyi index de07b8e..102a081 100644 --- a/django-stubs/db/backends/utils.pyi +++ b/django-stubs/db/backends/utils.pyi @@ -1,7 +1,7 @@ import types from datetime import date, datetime, time from decimal import Decimal -from typing import Any, ContextManager, Dict, List, Mapping, Optional, Sequence, Tuple, Type, Union, Iterator +from typing import Any, ContextManager, Dict, Iterator, List, Mapping, Optional, Sequence, Tuple, Type, Union from uuid import UUID logger: Any diff --git a/django-stubs/db/migrations/__init__.pyi b/django-stubs/db/migrations/__init__.pyi index bf1bdcd..4a8e9a2 100644 --- a/django-stubs/db/migrations/__init__.pyi +++ b/django-stubs/db/migrations/__init__.pyi @@ -2,5 +2,6 @@ # # NOTE: This dynamically typed stub was automatically generated by stubgen. -from .migration import Migration as Migration, swappable_dependency as swappable_dependency +from .migration import Migration as Migration +from .migration import swappable_dependency as swappable_dependency from .operations import * diff --git a/django-stubs/db/migrations/loader.pyi b/django-stubs/db/migrations/loader.pyi index c63336d..3955f05 100644 --- a/django-stubs/db/migrations/loader.pyi +++ b/django-stubs/db/migrations/loader.pyi @@ -4,12 +4,10 @@ from django.db.backends.base.base import BaseDatabaseWrapper from django.db.migrations.migration import Migration from django.db.migrations.state import ProjectState -from .exceptions import ( - AmbiguityError as AmbiguityError, - BadMigrationError as BadMigrationError, - InconsistentMigrationHistory as InconsistentMigrationHistory, - NodeNotFoundError as NodeNotFoundError, -) +from .exceptions import AmbiguityError as AmbiguityError +from .exceptions import BadMigrationError as BadMigrationError +from .exceptions import InconsistentMigrationHistory as InconsistentMigrationHistory +from .exceptions import NodeNotFoundError as NodeNotFoundError MIGRATIONS_MODULE_NAME: str diff --git a/django-stubs/db/migrations/migration.pyi b/django-stubs/db/migrations/migration.pyi index 093bc35..29e732a 100644 --- a/django-stubs/db/migrations/migration.pyi +++ b/django-stubs/db/migrations/migration.pyi @@ -1,8 +1,8 @@ -from typing import Tuple, List, Optional +from typing import List, Optional, Tuple from django.db.backends.base.schema import BaseDatabaseSchemaEditor -from django.db.migrations.state import ProjectState from django.db.migrations.operations.base import Operation +from django.db.migrations.state import ProjectState class Migration: operations: List[Operation] = ... diff --git a/django-stubs/db/migrations/operations/__init__.pyi b/django-stubs/db/migrations/operations/__init__.pyi index 6a520fe..fb91d90 100644 --- a/django-stubs/db/migrations/operations/__init__.pyi +++ b/django-stubs/db/migrations/operations/__init__.pyi @@ -1,22 +1,20 @@ -from .fields import ( - AddField as AddField, - AlterField as AlterField, - RemoveField as RemoveField, - RenameField as RenameField, -) -from .models import ( - AddIndex as AddIndex, - AlterIndexTogether as AlterIndexTogether, - AlterModelManagers as AlterModelManagers, - AlterModelOptions as AlterModelOptions, - AlterModelTable as AlterModelTable, - AlterOrderWithRespectTo as AlterOrderWithRespectTo, - AlterUniqueTogether as AlterUniqueTogether, - CreateModel as CreateModel, - DeleteModel as DeleteModel, - RemoveIndex as RemoveIndex, - RenameModel as RenameModel, - AddConstraint as AddConstraint, - RemoveConstraint as RemoveConstraint, -) -from .special import RunPython as RunPython, RunSQL as RunSQL, SeparateDatabaseAndState as SeparateDatabaseAndState +from .fields import AddField as AddField +from .fields import AlterField as AlterField +from .fields import RemoveField as RemoveField +from .fields import RenameField as RenameField +from .models import AddConstraint as AddConstraint +from .models import AddIndex as AddIndex +from .models import AlterIndexTogether as AlterIndexTogether +from .models import AlterModelManagers as AlterModelManagers +from .models import AlterModelOptions as AlterModelOptions +from .models import AlterModelTable as AlterModelTable +from .models import AlterOrderWithRespectTo as AlterOrderWithRespectTo +from .models import AlterUniqueTogether as AlterUniqueTogether +from .models import CreateModel as CreateModel +from .models import DeleteModel as DeleteModel +from .models import RemoveConstraint as RemoveConstraint +from .models import RemoveIndex as RemoveIndex +from .models import RenameModel as RenameModel +from .special import RunPython as RunPython +from .special import RunSQL as RunSQL +from .special import SeparateDatabaseAndState as SeparateDatabaseAndState diff --git a/django-stubs/db/migrations/operations/fields.pyi b/django-stubs/db/migrations/operations/fields.pyi index 1909aa3..568f24c 100644 --- a/django-stubs/db/migrations/operations/fields.pyi +++ b/django-stubs/db/migrations/operations/fields.pyi @@ -1,6 +1,7 @@ from typing import Any, Optional from django.db.models.fields import Field + from .base import Operation class FieldOperation(Operation): diff --git a/django-stubs/db/migrations/operations/models.pyi b/django-stubs/db/migrations/operations/models.pyi index b6cccf7..e27fa89 100644 --- a/django-stubs/db/migrations/operations/models.pyi +++ b/django-stubs/db/migrations/operations/models.pyi @@ -1,11 +1,10 @@ from typing import Any, Collection, Dict, List, Optional, Sequence, Tuple, Union from django.db.migrations.operations.base import Operation -from django.db.models.indexes import Index -from django.db.models.manager import Manager - from django.db.models.constraints import BaseConstraint from django.db.models.fields import Field +from django.db.models.indexes import Index +from django.db.models.manager import Manager class ModelOperation(Operation): name: str = ... diff --git a/django-stubs/db/migrations/operations/utils.pyi b/django-stubs/db/migrations/operations/utils.pyi index 58c49d8..c159277 100644 --- a/django-stubs/db/migrations/operations/utils.pyi +++ b/django-stubs/db/migrations/operations/utils.pyi @@ -1,5 +1,4 @@ from django.db.migrations.state import ProjectState - from django.db.models.fields import Field def is_referenced_by_foreign_key(state: ProjectState, model_name_lower: str, field: Field, field_name: str) -> bool: ... diff --git a/django-stubs/db/migrations/questioner.pyi b/django-stubs/db/migrations/questioner.pyi index 2a2ff1c..07add6d 100644 --- a/django-stubs/db/migrations/questioner.pyi +++ b/django-stubs/db/migrations/questioner.pyi @@ -1,7 +1,6 @@ from typing import Any, Dict, Optional, Set from django.db.migrations.state import ModelState - from django.db.models.fields import Field class MigrationQuestioner: diff --git a/django-stubs/db/migrations/recorder.pyi b/django-stubs/db/migrations/recorder.pyi index 7a96322..a977aef 100644 --- a/django-stubs/db/migrations/recorder.pyi +++ b/django-stubs/db/migrations/recorder.pyi @@ -1,10 +1,9 @@ from typing import Any, Optional, Set, Tuple +from django.db import models from django.db.backends.base.base import BaseDatabaseWrapper from django.db.models.query import QuerySet -from django.db import models - class MigrationRecorder: class Migration(models.Model): app: Any = ... diff --git a/django-stubs/db/migrations/serializer.pyi b/django-stubs/db/migrations/serializer.pyi index 8a84bd3..3dc3ced 100644 --- a/django-stubs/db/migrations/serializer.pyi +++ b/django-stubs/db/migrations/serializer.pyi @@ -1,4 +1,4 @@ -from typing import Any, Callable, Dict, List, Set, Tuple, Union, Type +from typing import Any, Callable, Dict, List, Set, Tuple, Type, Union class BaseSerializer: value: Any = ... diff --git a/django-stubs/db/migrations/state.pyi b/django-stubs/db/migrations/state.pyi index bc1e8f2..7ce4e62 100644 --- a/django-stubs/db/migrations/state.pyi +++ b/django-stubs/db/migrations/state.pyi @@ -1,11 +1,10 @@ -from typing import Any, Dict, Iterator, List, Optional, Sequence, Tuple, Type, Union, Set +from typing import Any, Dict, Iterator, List, Optional, Sequence, Set, Tuple, Type, Union from django.apps import AppConfig from django.apps.registry import Apps from django.db.models.base import Model -from django.db.models.manager import Manager - from django.db.models.fields import Field +from django.db.models.manager import Manager class AppConfigStub(AppConfig): ... diff --git a/django-stubs/db/migrations/writer.pyi b/django-stubs/db/migrations/writer.pyi index 751d8a9..f22b41c 100644 --- a/django-stubs/db/migrations/writer.pyi +++ b/django-stubs/db/migrations/writer.pyi @@ -1,4 +1,4 @@ -from typing import Any, List, Set, Tuple, Union, Type +from typing import Any, List, Set, Tuple, Type, Union from django.db.migrations.migration import Migration from django.db.migrations.operations.base import Operation diff --git a/django-stubs/db/models/__init__.pyi b/django-stubs/db/models/__init__.pyi index a563a65..c7ee843 100644 --- a/django-stubs/db/models/__init__.pyi +++ b/django-stubs/db/models/__init__.pyi @@ -1,139 +1,104 @@ -from .base import Model as Model - -from .aggregates import ( - Aggregate as Aggregate, - Avg as Avg, - Count as Count, - Max as Max, - Min as Min, - StdDev as StdDev, - Sum as Sum, - Variance as Variance, -) - -from .fields import ( - FieldDoesNotExist as FieldDoesNotExist, - AutoField as AutoField, - IntegerField as IntegerField, - PositiveIntegerField as PositiveIntegerField, - PositiveSmallIntegerField as PositiveSmallIntegerField, - PositiveBigIntegerField as PositiveBigIntegerField, - SmallIntegerField as SmallIntegerField, - BigIntegerField as BigIntegerField, - FloatField as FloatField, - CharField as CharField, - EmailField as EmailField, - URLField as URLField, - Field as Field, - SlugField as SlugField, - TextField as TextField, - BooleanField as BooleanField, - NullBooleanField as NullBooleanField, - DateField as DateField, - TimeField as TimeField, - DateTimeField as DateTimeField, - IPAddressField as IPAddressField, - GenericIPAddressField as GenericIPAddressField, - UUIDField as UUIDField, - DecimalField as DecimalField, - FilePathField as FilePathField, - BinaryField as BinaryField, - DurationField as DurationField, - BigAutoField as BigAutoField, - CommaSeparatedIntegerField as CommaSeparatedIntegerField, - NOT_PROVIDED as NOT_PROVIDED, -) - -from .fields.related import ( - ForeignKey as ForeignKey, - OneToOneField as OneToOneField, - ManyToManyField as ManyToManyField, - ForeignObject as ForeignObject, - ManyToManyRel as ManyToManyRel, - ManyToOneRel as ManyToOneRel, - OneToOneRel as OneToOneRel, - ForeignObjectRel as ForeignObjectRel, -) -from .fields.files import ( - ImageField as ImageField, - FileField as FileField, - FieldFile as FieldFile, - FileDescriptor as FileDescriptor, -) -from .fields.proxy import OrderWrt as OrderWrt -from .fields.json import JSONField as JSONField - -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, - RESTRICT as RESTRICT, - ProtectedError as ProtectedError, - RestrictedError as RestrictedError, -) - -from .query import ( - Prefetch as Prefetch, - QuerySet as QuerySet, - RawQuerySet as RawQuerySet, - prefetch_related_objects as prefetch_related_objects, -) - -from .query_utils import Q as Q, FilteredRelation as FilteredRelation - -from .lookups import Lookup as Lookup, Transform as Transform - -from .expressions import ( - F as F, - Expression as Expression, - Subquery as Subquery, - Exists as Exists, - OrderBy as OrderBy, - OuterRef as OuterRef, - Case as Case, - When as When, - RawSQL as RawSQL, - Value as Value, - Func as Func, - ExpressionWrapper as ExpressionWrapper, - Combinable as Combinable, - Col as Col, - CombinedExpression as CombinedExpression, - ExpressionList as ExpressionList, - Random as Random, - Ref as Ref, - Window as Window, - WindowFrame as WindowFrame, - RowRange as RowRange, - ValueRange as ValueRange, -) - -from .manager import BaseManager as BaseManager, Manager as Manager - from . import lookups as lookups - -from .aggregates import ( - Avg as Avg, - Min as Min, - Max as Max, - Variance as Variance, - StdDev as StdDev, - Sum as Sum, - Aggregate as Aggregate, -) - -from .indexes import Index as Index - from . import signals as signals - -from .constraints import ( - BaseConstraint as BaseConstraint, - CheckConstraint as CheckConstraint, - Deferrable as Deferrable, - UniqueConstraint as UniqueConstraint, -) - -from .enums import Choices as Choices, IntegerChoices as IntegerChoices, TextChoices as TextChoices +from .aggregates import Aggregate as Aggregate +from .aggregates import Avg as Avg +from .aggregates import Count as Count +from .aggregates import Max as Max +from .aggregates import Min as Min +from .aggregates import StdDev as StdDev +from .aggregates import Sum as Sum +from .aggregates import Variance as Variance +from .base import Model as Model +from .constraints import BaseConstraint as BaseConstraint +from .constraints import CheckConstraint as CheckConstraint +from .constraints import Deferrable as Deferrable +from .constraints import UniqueConstraint as UniqueConstraint +from .deletion import CASCADE as CASCADE +from .deletion import DO_NOTHING as DO_NOTHING +from .deletion import PROTECT as PROTECT +from .deletion import RESTRICT as RESTRICT +from .deletion import SET as SET +from .deletion import SET_DEFAULT as SET_DEFAULT +from .deletion import SET_NULL as SET_NULL +from .deletion import ProtectedError as ProtectedError +from .deletion import RestrictedError as RestrictedError +from .enums import Choices as Choices +from .enums import IntegerChoices as IntegerChoices +from .enums import TextChoices as TextChoices +from .expressions import Case as Case +from .expressions import Col as Col +from .expressions import Combinable as Combinable +from .expressions import CombinedExpression as CombinedExpression +from .expressions import Exists as Exists +from .expressions import Expression as Expression +from .expressions import ExpressionList as ExpressionList +from .expressions import ExpressionWrapper as ExpressionWrapper +from .expressions import F as F +from .expressions import Func as Func +from .expressions import OrderBy as OrderBy +from .expressions import OuterRef as OuterRef +from .expressions import Random as Random +from .expressions import RawSQL as RawSQL +from .expressions import Ref as Ref +from .expressions import RowRange as RowRange +from .expressions import Subquery as Subquery +from .expressions import Value as Value +from .expressions import ValueRange as ValueRange +from .expressions import When as When +from .expressions import Window as Window +from .expressions import WindowFrame as WindowFrame +from .fields import NOT_PROVIDED as NOT_PROVIDED +from .fields import AutoField as AutoField +from .fields import BigAutoField as BigAutoField +from .fields import BigIntegerField as BigIntegerField +from .fields import BinaryField as BinaryField +from .fields import BooleanField as BooleanField +from .fields import CharField as CharField +from .fields import CommaSeparatedIntegerField as CommaSeparatedIntegerField +from .fields import DateField as DateField +from .fields import DateTimeField as DateTimeField +from .fields import DecimalField as DecimalField +from .fields import DurationField as DurationField +from .fields import EmailField as EmailField +from .fields import Field as Field +from .fields import FieldDoesNotExist as FieldDoesNotExist +from .fields import FilePathField as FilePathField +from .fields import FloatField as FloatField +from .fields import GenericIPAddressField as GenericIPAddressField +from .fields import IntegerField as IntegerField +from .fields import IPAddressField as IPAddressField +from .fields import NullBooleanField as NullBooleanField +from .fields import PositiveBigIntegerField as PositiveBigIntegerField +from .fields import PositiveIntegerField as PositiveIntegerField +from .fields import PositiveSmallIntegerField as PositiveSmallIntegerField +from .fields import SlugField as SlugField +from .fields import SmallIntegerField as SmallIntegerField +from .fields import TextField as TextField +from .fields import TimeField as TimeField +from .fields import URLField as URLField +from .fields import UUIDField as UUIDField +from .fields.files import FieldFile as FieldFile +from .fields.files import FileDescriptor as FileDescriptor +from .fields.files import FileField as FileField +from .fields.files import ImageField as ImageField +from .fields.json import JSONField as JSONField +from .fields.proxy import OrderWrt as OrderWrt +from .fields.related import ForeignKey as ForeignKey +from .fields.related import ForeignObject as ForeignObject +from .fields.related import ForeignObjectRel as ForeignObjectRel +from .fields.related import ManyToManyField as ManyToManyField +from .fields.related import ManyToManyRel as ManyToManyRel +from .fields.related import ManyToOneRel as ManyToOneRel +from .fields.related import OneToOneField as OneToOneField +from .fields.related import OneToOneRel as OneToOneRel +from .indexes import Index as Index +from .lookups import Lookup as Lookup +from .lookups import Transform as Transform +from .manager import BaseManager as BaseManager +from .manager import Manager as Manager +from .query import Prefetch as Prefetch +from .query import QuerySet as QuerySet +from .query import RawQuerySet as RawQuerySet +from .query import prefetch_related_objects as prefetch_related_objects +from .query_utils import FilteredRelation as FilteredRelation +from .query_utils import Q as Q diff --git a/django-stubs/db/models/base.pyi b/django-stubs/db/models/base.pyi index eeaa272..4527780 100644 --- a/django-stubs/db/models/base.pyi +++ b/django-stubs/db/models/base.pyi @@ -1,11 +1,8 @@ from typing import Any, Callable, Collection, Dict, Iterable, List, Optional, Set, Tuple, Type, TypeVar, Union from django.core.checks.messages import CheckMessage -from django.core.exceptions import ( - ValidationError, - ObjectDoesNotExist, - MultipleObjectsReturned as BaseMultipleObjectsReturned, -) +from django.core.exceptions import MultipleObjectsReturned as BaseMultipleObjectsReturned +from django.core.exceptions import ObjectDoesNotExist, ValidationError from django.db.models.manager import BaseManager from django.db.models.options import Options diff --git a/django-stubs/db/models/deletion.pyi b/django-stubs/db/models/deletion.pyi index 061e5b7..3d5f175 100644 --- a/django-stubs/db/models/deletion.pyi +++ b/django-stubs/db/models/deletion.pyi @@ -1,8 +1,7 @@ -from typing import Any, Callable, Iterable, Optional, Union, Collection, Type - -from django.db.models.base import Model +from typing import Any, Callable, Collection, Iterable, Optional, Type, Union from django.db import IntegrityError +from django.db.models.base import Model from django.db.models.fields import Field from django.db.models.options import Options diff --git a/django-stubs/db/models/expressions.pyi b/django-stubs/db/models/expressions.pyi index 0530cbf..ea5079b 100644 --- a/django-stubs/db/models/expressions.pyi +++ b/django-stubs/db/models/expressions.pyi @@ -1,14 +1,13 @@ from datetime import datetime, timedelta from decimal import Decimal -from typing import Any, Callable, Dict, Iterator, List, Optional, Sequence, Set, Tuple, Type, TypeVar, Union, Iterable - -from django.db.models.lookups import Lookup -from django.db.models.sql.compiler import SQLCompiler +from typing import Any, Callable, Dict, Iterable, Iterator, List, Optional, Sequence, Set, Tuple, Type, TypeVar, Union from django.db.backends.base.base import BaseDatabaseWrapper from django.db.models import Q, QuerySet from django.db.models.fields import Field +from django.db.models.lookups import Lookup from django.db.models.query import QuerySet +from django.db.models.sql.compiler import SQLCompiler _OutputField = Union[Field, str] diff --git a/django-stubs/db/models/fields/__init__.pyi b/django-stubs/db/models/fields/__init__.pyi index 3dac311..38c7175 100644 --- a/django-stubs/db/models/fields/__init__.pyi +++ b/django-stubs/db/models/fields/__init__.pyi @@ -7,13 +7,13 @@ from typing import ( Dict, Generic, Iterable, + List, Optional, + Sequence, Tuple, Type, TypeVar, Union, - Sequence, - List, overload, ) @@ -21,9 +21,10 @@ from django.core.checks import CheckMessage from django.core.exceptions import FieldDoesNotExist as FieldDoesNotExist from django.db.backends.base.base import BaseDatabaseWrapper from django.db.models import Model -from django.db.models.expressions import Combinable, Col +from django.db.models.expressions import Col, Combinable from django.db.models.query_utils import RegisterLookupMixin -from django.forms import Field as FormField, Widget +from django.forms import Field as FormField +from django.forms import Widget class NOT_PROVIDED: ... diff --git a/django-stubs/db/models/fields/files.pyi b/django-stubs/db/models/fields/files.pyi index 6d9e444..db6505b 100644 --- a/django-stubs/db/models/fields/files.pyi +++ b/django-stubs/db/models/fields/files.pyi @@ -5,8 +5,7 @@ from django.core.files.base import File from django.core.files.images import ImageFile from django.core.files.storage import FileSystemStorage, Storage from django.db.models.base import Model - -from django.db.models.fields import Field, _FieldChoices, _ValidatorCallable, _ErrorMessagesToOverride +from django.db.models.fields import Field, _ErrorMessagesToOverride, _FieldChoices, _ValidatorCallable class FieldFile(File): instance: Model = ... diff --git a/django-stubs/db/models/fields/json.pyi b/django-stubs/db/models/fields/json.pyi index 9dbdffb..2041fd8 100644 --- a/django-stubs/db/models/fields/json.pyi +++ b/django-stubs/db/models/fields/json.pyi @@ -1,10 +1,12 @@ -from . import Field -from .mixins import CheckFieldDefaultMixin +from typing import Any, Callable, Optional + from django.db.backends.base.base import BaseDatabaseWrapper from django.db.models import lookups from django.db.models.lookups import PostgresOperatorLookup, Transform from django.db.models.sql.compiler import SQLCompiler -from typing import Any, Optional, Callable + +from . import Field +from .mixins import CheckFieldDefaultMixin class JSONField(CheckFieldDefaultMixin, Field): def __init__( diff --git a/django-stubs/db/models/fields/related.pyi b/django-stubs/db/models/fields/related.pyi index 053c274..08b5bc4 100644 --- a/django-stubs/db/models/fields/related.pyi +++ b/django-stubs/db/models/fields/related.pyi @@ -3,24 +3,22 @@ from uuid import UUID from django.db import models from django.db.models.base import Model -from django.db.models.fields import Field -from django.db.models.query_utils import Q, PathInfo -from django.db.models.manager import RelatedManager from django.db.models.expressions import Combinable +from django.db.models.fields import Field from django.db.models.fields.mixins import FieldCacheMixin +from django.db.models.fields.related_descriptors import ForwardManyToOneDescriptor as ForwardManyToOneDescriptor from django.db.models.fields.related_descriptors import ( # noqa: F401 ForwardOneToOneDescriptor as ForwardOneToOneDescriptor, - ForwardManyToOneDescriptor as ForwardManyToOneDescriptor, - ManyToManyDescriptor as ManyToManyDescriptor, - ReverseOneToOneDescriptor as ReverseOneToOneDescriptor, - ReverseManyToOneDescriptor as ReverseManyToOneDescriptor, -) -from django.db.models.fields.reverse_related import ( # noqa: F401 - ForeignObjectRel as ForeignObjectRel, - OneToOneRel as OneToOneRel, - ManyToOneRel as ManyToOneRel, - ManyToManyRel as ManyToManyRel, ) +from django.db.models.fields.related_descriptors import ManyToManyDescriptor as ManyToManyDescriptor +from django.db.models.fields.related_descriptors import ReverseManyToOneDescriptor as ReverseManyToOneDescriptor +from django.db.models.fields.related_descriptors import ReverseOneToOneDescriptor as ReverseOneToOneDescriptor +from django.db.models.fields.reverse_related import ForeignObjectRel as ForeignObjectRel # noqa: F401 +from django.db.models.fields.reverse_related import ManyToManyRel as ManyToManyRel +from django.db.models.fields.reverse_related import ManyToOneRel as ManyToOneRel +from django.db.models.fields.reverse_related import OneToOneRel as OneToOneRel +from django.db.models.manager import RelatedManager +from django.db.models.query_utils import PathInfo, Q _T = TypeVar("_T", bound=models.Model) _F = TypeVar("_F", bound=models.Field) diff --git a/django-stubs/db/models/fields/related_descriptors.pyi b/django-stubs/db/models/fields/related_descriptors.pyi index ef53788..6018b41 100644 --- a/django-stubs/db/models/fields/related_descriptors.pyi +++ b/django-stubs/db/models/fields/related_descriptors.pyi @@ -1,14 +1,13 @@ -from typing import Any, Callable, List, Optional, Tuple, Type, Union, Generic, TypeVar +from typing import Any, Callable, Generic, List, Optional, Tuple, Type, TypeVar, Union from django.core.exceptions import ObjectDoesNotExist from django.db.models.base import Model +from django.db.models.fields import Field from django.db.models.fields.mixins import FieldCacheMixin -from django.db.models.fields.related import RelatedField, OneToOneField +from django.db.models.fields.related import OneToOneField, RelatedField from django.db.models.fields.reverse_related import ManyToManyRel, OneToOneRel from django.db.models.query import QuerySet -from django.db.models.fields import Field - _T = TypeVar("_T") class ForwardManyToOneDescriptor: diff --git a/django-stubs/db/models/fields/related_lookups.pyi b/django-stubs/db/models/fields/related_lookups.pyi index c667edc..75db1e7 100644 --- a/django-stubs/db/models/fields/related_lookups.pyi +++ b/django-stubs/db/models/fields/related_lookups.pyi @@ -1,7 +1,8 @@ from collections import OrderedDict -from typing import Any, List, Tuple, Type, Iterable +from typing import Any, Iterable, List, Tuple, Type from django.db.models.expressions import Expression +from django.db.models.fields import Field from django.db.models.lookups import ( BuiltinLookup, Exact, @@ -13,8 +14,6 @@ from django.db.models.lookups import ( LessThanOrEqual, ) -from django.db.models.fields import Field - class MultiColSource: alias: str field: Field diff --git a/django-stubs/db/models/fields/reverse_related.pyi b/django-stubs/db/models/fields/reverse_related.pyi index c2a43dd..e7df871 100644 --- a/django-stubs/db/models/fields/reverse_related.pyi +++ b/django-stubs/db/models/fields/reverse_related.pyi @@ -1,12 +1,12 @@ from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union from django.db.models.base import Model +from django.db.models.fields import AutoField, Field from django.db.models.fields.related import ForeignKey, OneToOneField, RelatedField from django.db.models.lookups import BuiltinLookup, StartsWith from django.db.models.query_utils import FilteredRelation, PathInfo from django.db.models.sql.where import WhereNode -from django.db.models.fields import AutoField, Field from .mixins import FieldCacheMixin class ForeignObjectRel(FieldCacheMixin): diff --git a/django-stubs/db/models/functions/__init__.pyi b/django-stubs/db/models/functions/__init__.pyi index e95196a..186fb97 100644 --- a/django-stubs/db/models/functions/__init__.pyi +++ b/django-stubs/db/models/functions/__init__.pyi @@ -1,93 +1,85 @@ -from .text import ( - Lower as Lower, - Upper as Upper, - Length as Length, - Chr as Chr, - Concat as Concat, - ConcatPair as ConcatPair, - Left as Left, - Right as Right, - LPad as LPad, - RPad as RPad, - LTrim as LTrim, - RTrim as RTrim, - Trim as Trim, - Ord as Ord, - Repeat as Repeat, - SHA1 as SHA1, - SHA224 as SHA224, - SHA256 as SHA256, - SHA384 as SHA384, - SHA512 as SHA512, - StrIndex as StrIndex, - Substr as Substr, - Replace as Replace, - Reverse as Reverse, -) - -from .window import ( - CumeDist as CumeDist, - DenseRank as DenseRank, - FirstValue as FirstValue, - Lag as Lag, - LastValue as LastValue, - Lead as Lead, - NthValue as NthValue, - Ntile as Ntile, - PercentRank as PercentRank, - Rank as Rank, - RowNumber as RowNumber, -) - -from .datetime import ( - Extract as Extract, - ExtractDay as ExtractDay, - ExtractHour as ExtractHour, - ExtractMinute as ExtractMinute, - ExtractSecond as ExtractSecond, - ExtractMonth as ExtractMonth, - ExtractQuarter as ExtractQuarter, - ExtractWeek as ExtractWeek, - ExtractWeekDay as ExtractWeekDay, - ExtractYear as ExtractYear, - ExtractIsoYear as ExtractIsoYear, - Trunc as Trunc, - TruncDate as TruncDate, - TruncDay as TruncDay, - TruncHour as TruncHour, - TruncMinute as TruncMinute, - TruncQuarter as TruncQuarter, - TruncMonth as TruncMonth, - TruncSecond as TruncSecond, - TruncTime as TruncTime, - TruncWeek as TruncWeek, - TruncYear as TruncYear, - Now as Now, -) - -from .comparison import Coalesce as Coalesce, Greatest as Greatest, Least as Least, Cast as Cast, NullIf as NullIf - -from .math import ( - Abs as Abs, - ACos as ACos, - ASin as ASin, - ATan as ATan, - ATan2 as ATan2, - Ceil as Ceil, - Cos as Cos, - Cot as Cot, - Degrees as Degrees, - Floor as Floor, - Exp as Exp, - Ln as Ln, - Log as Log, - Mod as Mod, - Pi as Pi, - Power as Power, - Radians as Radians, - Round as Round, - Sign as Sign, - Sin as Sin, - Sqrt as Sqrt, - Tan as Tan, -) +from .comparison import Cast as Cast +from .comparison import Coalesce as Coalesce +from .comparison import Greatest as Greatest +from .comparison import Least as Least +from .comparison import NullIf as NullIf +from .datetime import Extract as Extract +from .datetime import ExtractDay as ExtractDay +from .datetime import ExtractHour as ExtractHour +from .datetime import ExtractIsoYear as ExtractIsoYear +from .datetime import ExtractMinute as ExtractMinute +from .datetime import ExtractMonth as ExtractMonth +from .datetime import ExtractQuarter as ExtractQuarter +from .datetime import ExtractSecond as ExtractSecond +from .datetime import ExtractWeek as ExtractWeek +from .datetime import ExtractWeekDay as ExtractWeekDay +from .datetime import ExtractYear as ExtractYear +from .datetime import Now as Now +from .datetime import Trunc as Trunc +from .datetime import TruncDate as TruncDate +from .datetime import TruncDay as TruncDay +from .datetime import TruncHour as TruncHour +from .datetime import TruncMinute as TruncMinute +from .datetime import TruncMonth as TruncMonth +from .datetime import TruncQuarter as TruncQuarter +from .datetime import TruncSecond as TruncSecond +from .datetime import TruncTime as TruncTime +from .datetime import TruncWeek as TruncWeek +from .datetime import TruncYear as TruncYear +from .math import Abs as Abs +from .math import ACos as ACos +from .math import ASin as ASin +from .math import ATan as ATan +from .math import ATan2 as ATan2 +from .math import Ceil as Ceil +from .math import Cos as Cos +from .math import Cot as Cot +from .math import Degrees as Degrees +from .math import Exp as Exp +from .math import Floor as Floor +from .math import Ln as Ln +from .math import Log as Log +from .math import Mod as Mod +from .math import Pi as Pi +from .math import Power as Power +from .math import Radians as Radians +from .math import Round as Round +from .math import Sign as Sign +from .math import Sin as Sin +from .math import Sqrt as Sqrt +from .math import Tan as Tan +from .text import SHA1 as SHA1 +from .text import SHA224 as SHA224 +from .text import SHA256 as SHA256 +from .text import SHA384 as SHA384 +from .text import SHA512 as SHA512 +from .text import Chr as Chr +from .text import Concat as Concat +from .text import ConcatPair as ConcatPair +from .text import Left as Left +from .text import Length as Length +from .text import Lower as Lower +from .text import LPad as LPad +from .text import LTrim as LTrim +from .text import Ord as Ord +from .text import Repeat as Repeat +from .text import Replace as Replace +from .text import Reverse as Reverse +from .text import Right as Right +from .text import RPad as RPad +from .text import RTrim as RTrim +from .text import StrIndex as StrIndex +from .text import Substr as Substr +from .text import Trim as Trim +from .text import Upper as Upper +from .window import CumeDist as CumeDist +from .window import DenseRank as DenseRank +from .window import FirstValue as FirstValue +from .window import Lag as Lag +from .window import LastValue as LastValue +from .window import Lead as Lead +from .window import NthValue as NthValue +from .window import Ntile as Ntile +from .window import PercentRank as PercentRank +from .window import Rank as Rank +from .window import RowNumber as RowNumber diff --git a/django-stubs/db/models/functions/text.pyi b/django-stubs/db/models/functions/text.pyi index a2e757c..e1ed86b 100644 --- a/django-stubs/db/models/functions/text.pyi +++ b/django-stubs/db/models/functions/text.pyi @@ -1,11 +1,10 @@ from typing import Any, List, Optional, Tuple, Union from django.db.backends.base.base import BaseDatabaseWrapper +from django.db.models import Func, Transform from django.db.models.expressions import Combinable, Expression, Value from django.db.models.sql.compiler import SQLCompiler -from django.db.models import Func, Transform - class BytesToCharFieldConversionMixin: ... class Chr(Transform): ... diff --git a/django-stubs/db/models/lookups.pyi b/django-stubs/db/models/lookups.pyi index 3f9230c..47f67d0 100644 --- a/django-stubs/db/models/lookups.pyi +++ b/django-stubs/db/models/lookups.pyi @@ -1,15 +1,14 @@ from datetime import datetime -from typing import Any, Iterable, List, Optional, Tuple, Type, Union, Mapping, TypeVar, Generic +from typing import Any, Generic, Iterable, List, Mapping, Optional, Tuple, Type, TypeVar, Union from django.db.backends.base.base import BaseDatabaseWrapper from django.db.models.expressions import Expression, Func +from django.db.models.fields import TextField, related_lookups from django.db.models.query_utils import RegisterLookupMixin from django.db.models.sql.compiler import SQLCompiler from django.utils.datastructures import OrderedSet from django.utils.safestring import SafeText -from django.db.models.fields import TextField, related_lookups - _T = TypeVar("_T") class Lookup(Generic[_T]): diff --git a/django-stubs/db/models/manager.pyi b/django-stubs/db/models/manager.pyi index 50bef8d..263530a 100644 --- a/django-stubs/db/models/manager.pyi +++ b/django-stubs/db/models/manager.pyi @@ -1,4 +1,4 @@ -from typing import Any, Dict, List, Optional, Tuple, Type, TypeVar, Iterable, Union +from typing import Any, Dict, Iterable, List, Optional, Tuple, Type, TypeVar, Union from django.db.models.base import Model from django.db.models.query import QuerySet diff --git a/django-stubs/db/models/options.pyi b/django-stubs/db/models/options.pyi index 4a4f903..e25d2f6 100644 --- a/django-stubs/db/models/options.pyi +++ b/django-stubs/db/models/options.pyi @@ -9,6 +9,7 @@ from django.contrib.postgres.fields.citext import CIText from django.db.backends.base.base import BaseDatabaseWrapper from django.db.models.base import Model from django.db.models.constraints import BaseConstraint +from django.db.models.fields import AutoField, Field from django.db.models.fields.mixins import FieldCacheMixin from django.db.models.fields.related import ManyToManyField, OneToOneField from django.db.models.fields.reverse_related import ForeignObjectRel @@ -16,8 +17,6 @@ from django.db.models.manager import Manager from django.db.models.query_utils import PathInfo from django.utils.datastructures import ImmutableList -from django.db.models.fields import AutoField, Field - PROXY_PARENTS: Any EMPTY_RELATION_TREE: Any IMMUTABLE_WARNING: str diff --git a/django-stubs/db/models/query.pyi b/django-stubs/db/models/query.pyi index 034fac0..8395a08 100644 --- a/django-stubs/db/models/query.pyi +++ b/django-stubs/db/models/query.pyi @@ -9,6 +9,7 @@ from typing import ( List, MutableMapping, Optional, + Reversible, Sequence, Sized, Tuple, @@ -16,16 +17,15 @@ from typing import ( TypeVar, Union, overload, - Reversible, ) -from django.db.models.base import Model -from django.db.models.expressions import Combinable as Combinable, F as F # noqa: F401 -from django.db.models.sql.query import Query, RawQuery - from django.db import models from django.db.models import Manager +from django.db.models.base import Model +from django.db.models.expressions import Combinable as Combinable # noqa: F401 +from django.db.models.expressions import F as F from django.db.models.query_utils import Q as Q # noqa: F401 +from django.db.models.sql.query import Query, RawQuery _T = TypeVar("_T", bound=models.Model, covariant=True) _QS = TypeVar("_QS", bound="QuerySet") @@ -125,8 +125,6 @@ class QuerySet(Generic[_T], Collection[_T], Reversible[_T], Sized): @property def db(self) -> str: ... def resolve_expression(self, *args: Any, **kwargs: Any) -> Any: ... - - def __iter__(self) -> Iterator[_T]: ... def __contains__(self, x: object) -> bool: ... @overload @@ -137,21 +135,21 @@ class QuerySet(Generic[_T], Collection[_T], Reversible[_T], Sized): _Row = TypeVar("_Row", covariant=True) -class _ValuesQuerySet(Generic[_T, _Row], Collection[_Row], Reversible[_Row], QuerySet[_T], Sized): # type: ignore +class _ValuesQuerySet(Generic[_T, _Row], Collection[_Row], Reversible[_Row], QuerySet[_T], Sized): # type: ignore def __len__(self) -> int: ... def __contains__(self, x: object) -> bool: ... def __iter__(self) -> Iterator[_Row]: ... @overload def __getitem__(self, i: int) -> _Row: ... @overload - def __getitem__(self: _QS, s: slice) -> _QS: ... # type: ignore + def __getitem__(self: _QS, s: slice) -> _QS: ... # type: ignore def iterator(self, chunk_size: int = ...) -> Iterator[_Row]: ... def get(self, *args: Any, **kwargs: Any) -> _Row: ... def earliest(self, *fields: Any, field_name: Optional[Any] = ...) -> _Row: ... def latest(self, *fields: Any, field_name: Optional[Any] = ...) -> _Row: ... def first(self) -> Optional[_Row]: ... def last(self) -> Optional[_Row]: ... - def distinct(self, *field_names: Any) -> _ValuesQuerySet[_T, _Row]: ... + def distinct(self, *field_names: Any) -> _ValuesQuerySet[_T, _Row]: ... def order_by(self, *field_names: Any) -> _ValuesQuerySet[_T, _Row]: ... def all(self) -> _ValuesQuerySet[_T, _Row]: ... def annotate(self, *args: Any, **kwargs: Any) -> _ValuesQuerySet[_T, Any]: ... diff --git a/django-stubs/db/models/query_utils.pyi b/django-stubs/db/models/query_utils.pyi index 4aedc12..84f91d6 100644 --- a/django-stubs/db/models/query_utils.pyi +++ b/django-stubs/db/models/query_utils.pyi @@ -3,12 +3,11 @@ from typing import Any, Collection, Dict, Iterator, List, Mapping, Optional, Seq from django.db.backends.base.base import BaseDatabaseWrapper from django.db.models.base import Model +from django.db.models.fields import Field from django.db.models.fields.mixins import FieldCacheMixin from django.db.models.sql.compiler import SQLCompiler from django.db.models.sql.query import Query from django.db.models.sql.where import WhereNode - -from django.db.models.fields import Field from django.utils import tree PathInfo = namedtuple("PathInfo", "from_opts to_opts target_fields join_field m2m direct filtered_relation") diff --git a/django-stubs/db/models/sql/__init__.pyi b/django-stubs/db/models/sql/__init__.pyi index f5fadda..ee2ea48 100644 --- a/django-stubs/db/models/sql/__init__.pyi +++ b/django-stubs/db/models/sql/__init__.pyi @@ -1,8 +1,6 @@ -from .query import Query as Query, RawQuery as RawQuery - -from .subqueries import ( - InsertQuery as InsertQuery, - AggregateQuery as AggregateQuery, - DeleteQuery as DeleteQuery, - UpdateQuery as UpdateQuery, -) +from .query import Query as Query +from .query import RawQuery as RawQuery +from .subqueries import AggregateQuery as AggregateQuery +from .subqueries import DeleteQuery as DeleteQuery +from .subqueries import InsertQuery as InsertQuery +from .subqueries import UpdateQuery as UpdateQuery diff --git a/django-stubs/db/models/sql/query.pyi b/django-stubs/db/models/sql/query.pyi index 3ab8652..008e1dd 100644 --- a/django-stubs/db/models/sql/query.pyi +++ b/django-stubs/db/models/sql/query.pyi @@ -1,6 +1,6 @@ import collections from collections import OrderedDict, namedtuple -from typing import Any, Callable, Dict, Iterator, List, Optional, Sequence, Set, Tuple, Type, Union, Iterable +from typing import Any, Callable, Dict, Iterable, Iterator, List, Optional, Sequence, Set, Tuple, Type, Union from django.db.backends.base.base import BaseDatabaseWrapper from django.db.models import Expression, Field, FilteredRelation, Model, Q, QuerySet diff --git a/django-stubs/db/models/sql/subqueries.pyi b/django-stubs/db/models/sql/subqueries.pyi index ba3d7e8..f2b684f 100644 --- a/django-stubs/db/models/sql/subqueries.pyi +++ b/django-stubs/db/models/sql/subqueries.pyi @@ -2,12 +2,11 @@ from typing import Any, Dict, Iterable, List, Optional, Tuple, Type, Union from django.db.models.base import Model from django.db.models.expressions import Case +from django.db.models.fields import Field from django.db.models.query import QuerySet from django.db.models.sql.query import Query from django.db.models.sql.where import WhereNode -from django.db.models.fields import Field - class DeleteQuery(Query): select: Tuple where_class: Type[WhereNode] diff --git a/django-stubs/db/transaction.pyi b/django-stubs/db/transaction.pyi index 567bcae..953abca 100644 --- a/django-stubs/db/transaction.pyi +++ b/django-stubs/db/transaction.pyi @@ -1,5 +1,5 @@ from contextlib import contextmanager -from typing import Any, Callable, Optional, overload, TypeVar, Iterator +from typing import Any, Callable, Iterator, Optional, TypeVar, overload from django.db import ProgrammingError diff --git a/django-stubs/db/utils.pyi b/django-stubs/db/utils.pyi index 18832e0..ed569f6 100644 --- a/django-stubs/db/utils.pyi +++ b/django-stubs/db/utils.pyi @@ -1,4 +1,4 @@ -from typing import Any, Dict, Iterable, List, Optional, Iterator, Type +from typing import Any, Dict, Iterable, Iterator, List, Optional, Type from django.apps import AppConfig from django.db.backends.base.base import BaseDatabaseWrapper diff --git a/django-stubs/dispatch/__init__.pyi b/django-stubs/dispatch/__init__.pyi index 97080cd..b228429 100644 --- a/django-stubs/dispatch/__init__.pyi +++ b/django-stubs/dispatch/__init__.pyi @@ -1 +1,2 @@ -from django.dispatch.dispatcher import Signal as Signal, receiver as receiver +from django.dispatch.dispatcher import Signal as Signal +from django.dispatch.dispatcher import receiver as receiver diff --git a/django-stubs/forms/__init__.pyi b/django-stubs/forms/__init__.pyi index 2e623bb..463615f 100644 --- a/django-stubs/forms/__init__.pyi +++ b/django-stubs/forms/__init__.pyi @@ -1,87 +1,80 @@ from django.core.exceptions import ValidationError as ValidationError -from .forms import Form as Form, BaseForm as BaseForm - -from .formsets import BaseFormSet as BaseFormSet, all_valid as all_valid, formset_factory as formset_factory - -from .models import ( - ModelForm as ModelForm, - ModelChoiceField as ModelChoiceField, - ModelMultipleChoiceField as ModelMultipleChoiceField, - model_to_dict as model_to_dict, - BaseModelForm as BaseModelForm, - BaseInlineFormSet as BaseInlineFormSet, - BaseModelFormSet as BaseModelFormSet, - fields_for_model as fields_for_model, - inlineformset_factory as inlineformset_factory, - modelform_factory as modelform_factory, - InlineForeignKeyField as InlineForeignKeyField, - ModelChoiceIterator as ModelChoiceIterator, - ModelFormMetaclass as ModelFormMetaclass, - ModelFormOptions as ModelFormOptions, - modelformset_factory as modelformset_factory, -) - -from .widgets import ( - Widget as Widget, - ChoiceWidget as ChoiceWidget, - NumberInput as NumberInput, - Select as Select, - CheckboxInput as CheckboxInput, - CheckboxSelectMultiple as CheckboxSelectMultiple, - Media as Media, - MultiWidget as MultiWidget, - TextInput as TextInput, - Textarea as Textarea, - Input as Input, - ClearableFileInput as ClearableFileInput, - DateInput as DateInput, - DateTimeBaseInput as DateTimeBaseInput, - DateTimeInput as DateTimeInput, - EmailInput as EmailInput, - FileInput as FileInput, - HiddenInput as HiddenInput, - MultipleHiddenInput as MultipleHiddenInput, - NullBooleanSelect as NullBooleanSelect, - PasswordInput as PasswordInput, - RadioSelect as RadioSelect, - SelectMultiple as SelectMultiple, - TimeInput as TimeInput, - URLInput as URLInput, - SelectDateWidget as SelectDateWidget, - SplitHiddenDateTimeWidget as SplitHiddenDateTimeWidget, - SplitDateTimeWidget as SplitDateTimeWidget, -) - -from .fields import ( - Field as Field, - CharField as CharField, - ChoiceField as ChoiceField, - DurationField as DurationField, - FileField as FileField, - ImageField as ImageField, - DateTimeField as DateTimeField, - DateField as DateField, - BooleanField as BooleanField, - EmailField as EmailField, - FloatField as FloatField, - MultiValueField as MultiValueField, - MultipleChoiceField as MultipleChoiceField, - NullBooleanField as NullBooleanField, - SplitDateTimeField as SplitDateTimeField, - TimeField as TimeField, - IntegerField as IntegerField, - FilePathField as FilePathField, - DecimalField as DecimalField, - UUIDField as UUIDField, - URLField as URLField, - ComboField as ComboField, - GenericIPAddressField as GenericIPAddressField, - RegexField as RegexField, - SlugField as SlugField, - TypedChoiceField as TypedChoiceField, - TypedMultipleChoiceField as TypedMultipleChoiceField, - JSONField as JSONField, -) - -from .boundfield import BoundField as BoundField, BoundWidget as BoundWidget +from .boundfield import BoundField as BoundField +from .boundfield import BoundWidget as BoundWidget +from .fields import BooleanField as BooleanField +from .fields import CharField as CharField +from .fields import ChoiceField as ChoiceField +from .fields import ComboField as ComboField +from .fields import DateField as DateField +from .fields import DateTimeField as DateTimeField +from .fields import DecimalField as DecimalField +from .fields import DurationField as DurationField +from .fields import EmailField as EmailField +from .fields import Field as Field +from .fields import FileField as FileField +from .fields import FilePathField as FilePathField +from .fields import FloatField as FloatField +from .fields import GenericIPAddressField as GenericIPAddressField +from .fields import ImageField as ImageField +from .fields import IntegerField as IntegerField +from .fields import JSONField as JSONField +from .fields import MultipleChoiceField as MultipleChoiceField +from .fields import MultiValueField as MultiValueField +from .fields import NullBooleanField as NullBooleanField +from .fields import RegexField as RegexField +from .fields import SlugField as SlugField +from .fields import SplitDateTimeField as SplitDateTimeField +from .fields import TimeField as TimeField +from .fields import TypedChoiceField as TypedChoiceField +from .fields import TypedMultipleChoiceField as TypedMultipleChoiceField +from .fields import URLField as URLField +from .fields import UUIDField as UUIDField +from .forms import BaseForm as BaseForm +from .forms import Form as Form +from .formsets import BaseFormSet as BaseFormSet +from .formsets import all_valid as all_valid +from .formsets import formset_factory as formset_factory +from .models import BaseInlineFormSet as BaseInlineFormSet +from .models import BaseModelForm as BaseModelForm +from .models import BaseModelFormSet as BaseModelFormSet +from .models import InlineForeignKeyField as InlineForeignKeyField +from .models import ModelChoiceField as ModelChoiceField +from .models import ModelChoiceIterator as ModelChoiceIterator +from .models import ModelForm as ModelForm +from .models import ModelFormMetaclass as ModelFormMetaclass +from .models import ModelFormOptions as ModelFormOptions +from .models import ModelMultipleChoiceField as ModelMultipleChoiceField +from .models import fields_for_model as fields_for_model +from .models import inlineformset_factory as inlineformset_factory +from .models import model_to_dict as model_to_dict +from .models import modelform_factory as modelform_factory +from .models import modelformset_factory as modelformset_factory +from .widgets import CheckboxInput as CheckboxInput +from .widgets import CheckboxSelectMultiple as CheckboxSelectMultiple +from .widgets import ChoiceWidget as ChoiceWidget +from .widgets import ClearableFileInput as ClearableFileInput +from .widgets import DateInput as DateInput +from .widgets import DateTimeBaseInput as DateTimeBaseInput +from .widgets import DateTimeInput as DateTimeInput +from .widgets import EmailInput as EmailInput +from .widgets import FileInput as FileInput +from .widgets import HiddenInput as HiddenInput +from .widgets import Input as Input +from .widgets import Media as Media +from .widgets import MultipleHiddenInput as MultipleHiddenInput +from .widgets import MultiWidget as MultiWidget +from .widgets import NullBooleanSelect as NullBooleanSelect +from .widgets import NumberInput as NumberInput +from .widgets import PasswordInput as PasswordInput +from .widgets import RadioSelect as RadioSelect +from .widgets import Select as Select +from .widgets import SelectDateWidget as SelectDateWidget +from .widgets import SelectMultiple as SelectMultiple +from .widgets import SplitDateTimeWidget as SplitDateTimeWidget +from .widgets import SplitHiddenDateTimeWidget as SplitHiddenDateTimeWidget +from .widgets import Textarea as Textarea +from .widgets import TextInput as TextInput +from .widgets import TimeInput as TimeInput +from .widgets import URLInput as URLInput +from .widgets import Widget as Widget diff --git a/django-stubs/forms/models.pyi b/django-stubs/forms/models.pyi index b5816b6..c890442 100644 --- a/django-stubs/forms/models.pyi +++ b/django-stubs/forms/models.pyi @@ -2,10 +2,12 @@ from datetime import datetime from typing import ( Any, Callable, + ClassVar, Collection, + Container, Dict, - Iterator, Generic, + Iterator, List, Mapping, MutableMapping, @@ -13,15 +15,15 @@ from typing import ( Sequence, Tuple, Type, - Union, - ClassVar, - Container, TypeVar, + Union, ) from unittest.mock import MagicMock from uuid import UUID from django.core.files.base import File +from django.db import models +from django.db.models import ForeignKey from django.db.models.base import Model from django.db.models.manager import Manager from django.db.models.query import QuerySet @@ -33,9 +35,6 @@ from django.forms.utils import ErrorList from django.forms.widgets import Input, Widget from typing_extensions import Literal -from django.db import models -from django.db.models import ForeignKey - ALL_FIELDS: str _Fields = Union[Collection[str], Literal["__all__"]] diff --git a/django-stubs/forms/renderers.pyi b/django-stubs/forms/renderers.pyi index ffdf34f..3c6227b 100644 --- a/django-stubs/forms/renderers.pyi +++ b/django-stubs/forms/renderers.pyi @@ -1,8 +1,7 @@ from typing import Any, Dict -from django.template.backends.base import BaseEngine - from django.template import Template +from django.template.backends.base import BaseEngine ROOT: Any diff --git a/django-stubs/http/__init__.pyi b/django-stubs/http/__init__.pyi index a8e4c86..a45c886 100644 --- a/django-stubs/http/__init__.pyi +++ b/django-stubs/http/__init__.pyi @@ -1,26 +1,21 @@ -from .request import ( - HttpRequest as HttpRequest, - QueryDict as QueryDict, - RawPostDataException as RawPostDataException, - UnreadablePostError as UnreadablePostError, -) - -from .response import ( - BadHeaderError as BadHeaderError, - FileResponse as FileResponse, - Http404 as Http404, - HttpResponse as HttpResponse, - HttpResponseBadRequest as HttpResponseBadRequest, - HttpResponseForbidden as HttpResponseForbidden, - HttpResponseGone as HttpResponseGone, - HttpResponseNotAllowed as HttpResponseNotAllowed, - HttpResponseNotFound as HttpResponseNotFound, - HttpResponseNotModified as HttpResponseNotModified, - HttpResponsePermanentRedirect as HttpResponsePermanentRedirect, - HttpResponseRedirect as HttpResponseRedirect, - HttpResponseServerError as HttpResponseServerError, - JsonResponse as JsonResponse, - StreamingHttpResponse as StreamingHttpResponse, -) - -from .cookie import SimpleCookie as SimpleCookie, parse_cookie as parse_cookie +from .cookie import SimpleCookie as SimpleCookie +from .cookie import parse_cookie as parse_cookie +from .request import HttpRequest as HttpRequest +from .request import QueryDict as QueryDict +from .request import RawPostDataException as RawPostDataException +from .request import UnreadablePostError as UnreadablePostError +from .response import BadHeaderError as BadHeaderError +from .response import FileResponse as FileResponse +from .response import Http404 as Http404 +from .response import HttpResponse as HttpResponse +from .response import HttpResponseBadRequest as HttpResponseBadRequest +from .response import HttpResponseForbidden as HttpResponseForbidden +from .response import HttpResponseGone as HttpResponseGone +from .response import HttpResponseNotAllowed as HttpResponseNotAllowed +from .response import HttpResponseNotFound as HttpResponseNotFound +from .response import HttpResponseNotModified as HttpResponseNotModified +from .response import HttpResponsePermanentRedirect as HttpResponsePermanentRedirect +from .response import HttpResponseRedirect as HttpResponseRedirect +from .response import HttpResponseServerError as HttpResponseServerError +from .response import JsonResponse as JsonResponse +from .response import StreamingHttpResponse as StreamingHttpResponse diff --git a/django-stubs/http/request.pyi b/django-stubs/http/request.pyi index e4abb8a..d620f90 100644 --- a/django-stubs/http/request.pyi +++ b/django-stubs/http/request.pyi @@ -20,10 +20,9 @@ from django.contrib.auth.base_user import AbstractBaseUser from django.contrib.auth.models import AnonymousUser from django.contrib.sessions.backends.base import SessionBase from django.contrib.sites.models import Site -from django.utils.datastructures import CaseInsensitiveMapping, ImmutableList, MultiValueDict - from django.core.files import uploadedfile, uploadhandler from django.urls import ResolverMatch +from django.utils.datastructures import CaseInsensitiveMapping, ImmutableList, MultiValueDict RAISE_ERROR: object = ... host_validation_re: Pattern = ... diff --git a/django-stubs/http/response.pyi b/django-stubs/http/response.pyi index bb6c2a5..1c67e5a 100644 --- a/django-stubs/http/response.pyi +++ b/django-stubs/http/response.pyi @@ -5,10 +5,10 @@ from typing import Any, Dict, Iterable, Iterator, List, Optional, Tuple, Type, U from django.core.handlers.wsgi import WSGIRequest from django.http.cookie import SimpleCookie -from django.test.client import Client -from django.utils.datastructures import CaseInsensitiveMapping from django.template import Context, Template +from django.test.client import Client from django.urls import ResolverMatch +from django.utils.datastructures import CaseInsensitiveMapping class BadHeaderError(ValueError): ... diff --git a/django-stubs/middleware/cache.pyi b/django-stubs/middleware/cache.pyi index 04c7eb2..07e194a 100644 --- a/django-stubs/middleware/cache.pyi +++ b/django-stubs/middleware/cache.pyi @@ -1,11 +1,10 @@ -from typing import Any, Optional, Union, Callable +from typing import Any, Callable, Optional, Union +from django.core.cache import BaseCache from django.http.request import HttpRequest from django.http.response import HttpResponse, HttpResponseBase from django.utils.deprecation import MiddlewareMixin -from django.core.cache import BaseCache - class UpdateCacheMiddleware(MiddlewareMixin): cache_timeout: float = ... key_prefix: str = ... diff --git a/django-stubs/shortcuts.pyi b/django-stubs/shortcuts.pyi index 736ee26..6d36905 100644 --- a/django-stubs/shortcuts.pyi +++ b/django-stubs/shortcuts.pyi @@ -1,15 +1,12 @@ import sys -from typing import Any, Callable, List, Mapping, Optional, overload, Protocol, Sequence, Type, TypeVar, Union - -from django.db.models.base import Model -from django.http.response import ( - HttpResponse as HttpResponse, - HttpResponseRedirect as HttpResponseRedirect, - HttpResponsePermanentRedirect as HttpResponsePermanentRedirect, -) +from typing import Any, Callable, List, Mapping, Optional, Protocol, Sequence, Type, TypeVar, Union, overload from django.db.models import Manager, QuerySet +from django.db.models.base import Model from django.http import HttpRequest +from django.http.response import HttpResponse as HttpResponse +from django.http.response import HttpResponsePermanentRedirect as HttpResponsePermanentRedirect +from django.http.response import HttpResponseRedirect as HttpResponseRedirect if sys.version_info < (3, 8): from typing_extensions import Literal diff --git a/django-stubs/template/__init__.pyi b/django-stubs/template/__init__.pyi index 02a0ada..124c699 100644 --- a/django-stubs/template/__init__.pyi +++ b/django-stubs/template/__init__.pyi @@ -3,14 +3,18 @@ from .utils import EngineHandler as EngineHandler engines: EngineHandler -from .base import VariableDoesNotExist as VariableDoesNotExist -from .context import ContextPopException as ContextPopException -from .exceptions import TemplateDoesNotExist as TemplateDoesNotExist, TemplateSyntaxError as TemplateSyntaxError +from . import defaultfilters as defaultfilters # Template parts -from .base import Node as Node, NodeList as NodeList, Origin as Origin, Template as Template, Variable as Variable -from .context import Context as Context, RequestContext as RequestContext - +from .base import Node as Node +from .base import NodeList as NodeList +from .base import Origin as Origin +from .base import Template as Template +from .base import Variable as Variable +from .base import VariableDoesNotExist as VariableDoesNotExist +from .context import Context as Context +from .context import ContextPopException as ContextPopException +from .context import RequestContext as RequestContext +from .exceptions import TemplateDoesNotExist as TemplateDoesNotExist +from .exceptions import TemplateSyntaxError as TemplateSyntaxError from .library import Library as Library - -from . import defaultfilters as defaultfilters diff --git a/django-stubs/template/context.pyi b/django-stubs/template/context.pyi index 1e95d6b..b7b303f 100644 --- a/django-stubs/template/context.pyi +++ b/django-stubs/template/context.pyi @@ -1,4 +1,4 @@ -from typing import Any, Callable, Dict, Iterator, List, Optional, Type, Union, Iterable +from typing import Any, Callable, Dict, Iterable, Iterator, List, Optional, Type, Union from django.http.request import HttpRequest from django.template.base import Node, Origin, Template diff --git a/django-stubs/template/defaultfilters.pyi b/django-stubs/template/defaultfilters.pyi index a66e1de..1ca8dba 100644 --- a/django-stubs/template/defaultfilters.pyi +++ b/django-stubs/template/defaultfilters.pyi @@ -1,8 +1,10 @@ -from datetime import date as _date, datetime, time as _time +from datetime import date as _date +from datetime import datetime +from datetime import time as _time from typing import Any, Callable, Dict, List, Optional, Union -from django.utils.safestring import SafeText from django.utils.html import escape as escape # noqa: F401 +from django.utils.safestring import SafeText register: Any diff --git a/django-stubs/template/engine.pyi b/django-stubs/template/engine.pyi index edd8c9a..719f252 100644 --- a/django-stubs/template/engine.pyi +++ b/django-stubs/template/engine.pyi @@ -1,4 +1,4 @@ -from typing import Any, Callable, Dict, List, Optional, Tuple, Union, Sequence +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from django.template.base import Origin from django.template.library import Library diff --git a/django-stubs/template/library.pyi b/django-stubs/template/library.pyi index 04e43a2..ab5b36f 100644 --- a/django-stubs/template/library.pyi +++ b/django-stubs/template/library.pyi @@ -1,6 +1,6 @@ from typing import Any, Callable, Dict, List, Optional, Tuple, TypeVar, Union, overload -from django.template.base import FilterExpression, Parser, Origin, Token +from django.template.base import FilterExpression, Origin, Parser, Token from django.template.context import Context from django.utils.safestring import SafeText diff --git a/django-stubs/template/loader.pyi b/django-stubs/template/loader.pyi index 0cd3214..3c676b2 100644 --- a/django-stubs/template/loader.pyi +++ b/django-stubs/template/loader.pyi @@ -1,9 +1,10 @@ from typing import Any, Dict, List, Optional, Union -from . import engines as engines # noqa: F401 from django.http.request import HttpRequest from django.template.exceptions import TemplateDoesNotExist as TemplateDoesNotExist # noqa: F401 +from . import engines as engines # noqa: F401 + def get_template(template_name: str, using: Optional[str] = ...) -> Any: ... def select_template(template_name_list: Union[List[str], str], using: Optional[str] = ...) -> Any: ... def render_to_string( diff --git a/django-stubs/template/loader_tags.pyi b/django-stubs/template/loader_tags.pyi index 3a35936..611b867 100644 --- a/django-stubs/template/loader_tags.pyi +++ b/django-stubs/template/loader_tags.pyi @@ -1,7 +1,7 @@ import collections from typing import Any, Dict, List, Optional, Union -from django.template.base import FilterExpression, NodeList, Parser, Token, Origin +from django.template.base import FilterExpression, NodeList, Origin, Parser, Token from django.template.context import Context from django.utils.safestring import SafeText diff --git a/django-stubs/template/loaders/base.pyi b/django-stubs/template/loaders/base.pyi index 034769a..a397854 100644 --- a/django-stubs/template/loaders/base.pyi +++ b/django-stubs/template/loaders/base.pyi @@ -1,4 +1,4 @@ -from typing import Any, List, Iterable, Optional, Dict +from typing import Any, Dict, Iterable, List, Optional from django.template.base import Origin, Template from django.template.engine import Engine diff --git a/django-stubs/template/response.pyi b/django-stubs/template/response.pyi index 02005a0..5fc5211 100644 --- a/django-stubs/template/response.pyi +++ b/django-stubs/template/response.pyi @@ -3,13 +3,12 @@ from http.cookies import SimpleCookie from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union from django.core.handlers.wsgi import WSGIRequest +from django.http import HttpResponse from django.http.request import HttpRequest from django.template.base import Template from django.template.context import RequestContext from django.test.client import Client -from django.http import HttpResponse - class ContentNotRenderedError(Exception): ... class SimpleTemplateResponse(HttpResponse): diff --git a/django-stubs/templatetags/cache.pyi b/django-stubs/templatetags/cache.pyi index 2f8d1f6..70eaee6 100644 --- a/django-stubs/templatetags/cache.pyi +++ b/django-stubs/templatetags/cache.pyi @@ -1,8 +1,7 @@ from typing import Any, List, Optional -from django.template.base import FilterExpression, NodeList, Parser, Token - from django.template import Node +from django.template.base import FilterExpression, NodeList, Parser, Token register: Any diff --git a/django-stubs/templatetags/i18n.pyi b/django-stubs/templatetags/i18n.pyi index a32fd8f..7546eba 100644 --- a/django-stubs/templatetags/i18n.pyi +++ b/django-stubs/templatetags/i18n.pyi @@ -1,8 +1,7 @@ from typing import Any, Dict, List, Optional, Tuple -from django.template.base import FilterExpression, NodeList, Parser, Token - from django.template import Node +from django.template.base import FilterExpression, NodeList, Parser, Token register: Any diff --git a/django-stubs/templatetags/l10n.pyi b/django-stubs/templatetags/l10n.pyi index 03c45bb..2dc3d52 100644 --- a/django-stubs/templatetags/l10n.pyi +++ b/django-stubs/templatetags/l10n.pyi @@ -1,8 +1,7 @@ from typing import Any, List -from django.template.base import Parser, Token - from django.template import Node +from django.template.base import Parser, Token register: Any diff --git a/django-stubs/templatetags/static.pyi b/django-stubs/templatetags/static.pyi index db254c7..d9f81c4 100644 --- a/django-stubs/templatetags/static.pyi +++ b/django-stubs/templatetags/static.pyi @@ -1,10 +1,9 @@ from typing import Any, Optional +from django import template from django.template.base import FilterExpression, Parser, Token from django.template.context import Context -from django import template - register: Any class PrefixNode(template.Node): diff --git a/django-stubs/templatetags/tz.pyi b/django-stubs/templatetags/tz.pyi index 7719adb..a9f07a3 100644 --- a/django-stubs/templatetags/tz.pyi +++ b/django-stubs/templatetags/tz.pyi @@ -1,11 +1,10 @@ from datetime import datetime from typing import Any, Optional, Union +from django.template import Node from django.template.base import FilterExpression, NodeList, Parser, Token from django.utils.timezone import FixedOffset -from django.template import Node - register: Any class datetimeobject(datetime): ... diff --git a/django-stubs/test/__init__.pyi b/django-stubs/test/__init__.pyi index e2f4371..ad42292 100644 --- a/django-stubs/test/__init__.pyi +++ b/django-stubs/test/__init__.pyi @@ -1,20 +1,15 @@ -from .testcases import ( - TestCase as TestCase, - TransactionTestCase as TransactionTestCase, - SimpleTestCase as SimpleTestCase, - LiveServerTestCase as LiveServerTestCase, - skipIfDBFeature as skipIfDBFeature, - skipUnlessDBFeature as skipUnlessDBFeature, - skipUnlessAnyDBFeature as skipUnlessAnyDBFeature, -) - -from .utils import ( - override_settings as override_settings, - modify_settings as modify_settings, - override_script_prefix as override_script_prefix, - override_system_checks as override_system_checks, - ignore_warnings as ignore_warnings, - tag as tag, -) - -from .client import Client as Client, RequestFactory as RequestFactory +from .client import Client as Client +from .client import RequestFactory as RequestFactory +from .testcases import LiveServerTestCase as LiveServerTestCase +from .testcases import SimpleTestCase as SimpleTestCase +from .testcases import TestCase as TestCase +from .testcases import TransactionTestCase as TransactionTestCase +from .testcases import skipIfDBFeature as skipIfDBFeature +from .testcases import skipUnlessAnyDBFeature as skipUnlessAnyDBFeature +from .testcases import skipUnlessDBFeature as skipUnlessDBFeature +from .utils import ignore_warnings as ignore_warnings +from .utils import modify_settings as modify_settings +from .utils import override_script_prefix as override_script_prefix +from .utils import override_settings as override_settings +from .utils import override_system_checks as override_system_checks +from .utils import tag as tag diff --git a/django-stubs/test/client.pyi b/django-stubs/test/client.pyi index 4a3e14c..6b6a4ce 100644 --- a/django-stubs/test/client.pyi +++ b/django-stubs/test/client.pyi @@ -1,17 +1,16 @@ from io import BytesIO +from json import JSONEncoder from types import TracebackType from typing import Any, Dict, List, Optional, Pattern, Tuple, Type, Union from django.contrib.auth.base_user import AbstractBaseUser from django.contrib.sessions.backends.base import SessionBase from django.core.handlers.base import BaseHandler +from django.core.handlers.wsgi import WSGIRequest from django.http.cookie import SimpleCookie from django.http.request import HttpRequest from django.http.response import HttpResponse, HttpResponseBase -from django.core.handlers.wsgi import WSGIRequest -from json import JSONEncoder - BOUNDARY: str = ... MULTIPART_CONTENT: str = ... CONTENT_TYPE_RE: Pattern = ... diff --git a/django-stubs/test/signals.pyi b/django-stubs/test/signals.pyi index 72c02df..cad7681 100644 --- 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 # noqa: F401 template_rendered: Any diff --git a/django-stubs/test/testcases.pyi b/django-stubs/test/testcases.pyi index eb94d1a..a1a69b5 100644 --- a/django-stubs/test/testcases.pyi +++ b/django-stubs/test/testcases.pyi @@ -1,11 +1,12 @@ import threading import unittest from datetime import date -from typing import Any, Callable, Dict, Iterator, List, Optional, Set, Tuple, Type, Union, ClassVar, overload +from typing import Any, Callable, ClassVar, Dict, Iterator, List, Optional, Set, Tuple, Type, Union, overload from django.core.exceptions import ImproperlyConfigured from django.core.handlers.wsgi import WSGIHandler from django.core.servers.basehttp import ThreadedWSGIServer, WSGIRequestHandler +from django.db import connections as connections # noqa: F401 from django.db.backends.base.base import BaseDatabaseWrapper from django.db.models.base import Model from django.db.models.query import QuerySet, RawQuerySet @@ -15,7 +16,6 @@ from django.template.base import Template from django.test.client import Client from django.test.utils import CaptureQueriesContext, ContextList from django.utils.safestring import SafeText -from django.db import connections as connections # noqa: F401 class _AssertNumQueriesContext(CaptureQueriesContext): test_case: SimpleTestCase = ... diff --git a/django-stubs/test/utils.pyi b/django-stubs/test/utils.pyi index 36bec18..d831f07 100644 --- a/django-stubs/test/utils.pyi +++ b/django-stubs/test/utils.pyi @@ -5,6 +5,7 @@ from io import StringIO from typing import ( Any, Callable, + ContextManager, Dict, Iterable, Iterator, @@ -14,21 +15,19 @@ from typing import ( Set, Tuple, Type, - Union, - ContextManager, TypeVar, + Union, ) from django.apps.registry import Apps +from django.conf import LazySettings, Settings from django.core.checks.registry import CheckRegistry +from django.db.backends.base.base import BaseDatabaseWrapper from django.db.models.lookups import Lookup, Transform from django.db.models.query_utils import RegisterLookupMixin from django.test.runner import DiscoverRunner from django.test.testcases import SimpleTestCase -from django.conf import LazySettings, Settings -from django.db.backends.base.base import BaseDatabaseWrapper - _TestClass = Type[SimpleTestCase] _DecoratedTest = Union[Callable, _TestClass] _C = TypeVar("_C", bound=Callable) # Any callable diff --git a/django-stubs/urls/__init__.pyi b/django-stubs/urls/__init__.pyi index 3742aa4..0144ac2 100644 --- a/django-stubs/urls/__init__.pyi +++ b/django-stubs/urls/__init__.pyi @@ -1,36 +1,36 @@ # noinspection PyUnresolvedReferences -from .base import ( - clear_script_prefix as clear_script_prefix, - clear_url_caches as clear_url_caches, - get_script_prefix as get_script_prefix, - get_urlconf as get_urlconf, - is_valid_path as is_valid_path, - resolve as resolve, - reverse as reverse, - reverse_lazy as reverse_lazy, - set_script_prefix as set_script_prefix, - set_urlconf as set_urlconf, - translate_url as translate_url, -) +from .base import clear_script_prefix as clear_script_prefix +from .base import clear_url_caches as clear_url_caches +from .base import get_script_prefix as get_script_prefix +from .base import get_urlconf as get_urlconf +from .base import is_valid_path as is_valid_path +from .base import resolve as resolve +from .base import reverse as reverse +from .base import reverse_lazy as reverse_lazy +from .base import set_script_prefix as set_script_prefix +from .base import set_urlconf as set_urlconf +from .base import translate_url as translate_url # noinspection PyUnresolvedReferences -from .conf import include as include, path as path, re_path as re_path +from .conf import include as include +from .conf import path as path +from .conf import re_path as re_path # noinspection PyUnresolvedReferences from .converters import register_converter as register_converter # noinspection PyUnresolvedReferences -from .exceptions import NoReverseMatch as NoReverseMatch, Resolver404 as Resolver404 +from .exceptions import NoReverseMatch as NoReverseMatch +from .exceptions import Resolver404 as Resolver404 # noinspection PyUnresolvedReferences -from .resolvers import ( - LocalePrefixPattern as LocalePrefixPattern, - ResolverMatch as ResolverMatch, - URLPattern as URLPattern, - URLResolver as URLResolver, - get_ns_resolver as get_ns_resolver, - get_resolver as get_resolver, -) +from .resolvers import LocalePrefixPattern as LocalePrefixPattern +from .resolvers import ResolverMatch as ResolverMatch +from .resolvers import URLPattern as URLPattern +from .resolvers import URLResolver as URLResolver +from .resolvers import get_ns_resolver as get_ns_resolver +from .resolvers import get_resolver as get_resolver # noinspection PyUnresolvedReferences -from .utils import get_callable as get_callable, get_mod_func as get_mod_func +from .utils import get_callable as get_callable +from .utils import get_mod_func as get_mod_func diff --git a/django-stubs/urls/base.pyi b/django-stubs/urls/base.pyi index d0e233d..b8b4dae 100644 --- a/django-stubs/urls/base.pyi +++ b/django-stubs/urls/base.pyi @@ -1,4 +1,4 @@ -from typing import Any, Callable, Dict, Optional, Type, Union, Sequence +from typing import Any, Callable, Dict, Optional, Sequence, Type, Union from django.urls.resolvers import ResolverMatch diff --git a/django-stubs/urls/conf.pyi b/django-stubs/urls/conf.pyi index d8251ba..4a79578 100644 --- a/django-stubs/urls/conf.pyi +++ b/django-stubs/urls/conf.pyi @@ -1,8 +1,8 @@ -from typing import Any, Optional, Sequence, Tuple, overload, Callable, Dict, Union +from typing import Any, Callable, Dict, Optional, Sequence, Tuple, Union, overload -from .resolvers import URLResolver, URLPattern from ..conf.urls import IncludedURLConf from ..http.response import HttpResponseBase +from .resolvers import URLPattern, URLResolver def include( arg: Any, namespace: Optional[str] = ... diff --git a/django-stubs/utils/autoreload.pyi b/django-stubs/utils/autoreload.pyi index edb6841..be7caad 100644 --- a/django-stubs/utils/autoreload.pyi +++ b/django-stubs/utils/autoreload.pyi @@ -1,7 +1,7 @@ import threading import types from pathlib import Path -from typing import Any, Callable, List, Optional, Set, Dict, Union, Iterator, Tuple, Iterable +from typing import Any, Callable, Dict, Iterable, Iterator, List, Optional, Set, Tuple, Union from django.apps.registry import Apps diff --git a/django-stubs/utils/datastructures.pyi b/django-stubs/utils/datastructures.pyi index 7b5f7b2..5b4a446 100644 --- a/django-stubs/utils/datastructures.pyi +++ b/django-stubs/utils/datastructures.pyi @@ -3,16 +3,16 @@ from typing import ( Callable, Dict, Iterable, + Iterator, List, Mapping, MutableMapping, MutableSet, + Optional, Tuple, TypeVar, Union, overload, - Iterator, - Optional, ) from typing_extensions import Literal diff --git a/django-stubs/utils/dateformat.pyi b/django-stubs/utils/dateformat.pyi index e9246e4..9c95bc1 100644 --- a/django-stubs/utils/dateformat.pyi +++ b/django-stubs/utils/dateformat.pyi @@ -1,4 +1,4 @@ -from datetime import datetime, date +from datetime import date, datetime from typing import Any, Optional, Union from django.utils.timezone import FixedOffset diff --git a/django-stubs/utils/datetime_safe.pyi b/django-stubs/utils/datetime_safe.pyi index 8dbfc71..49180d0 100644 --- a/django-stubs/utils/datetime_safe.pyi +++ b/django-stubs/utils/datetime_safe.pyi @@ -1,4 +1,6 @@ -from datetime import date as real_date, datetime as real_datetime, time as real_time +from datetime import date as real_date +from datetime import datetime as real_datetime +from datetime import time as real_time from typing import Union class date(real_date): ... diff --git a/django-stubs/utils/decorators.pyi b/django-stubs/utils/decorators.pyi index e58530a..0d98264 100644 --- a/django-stubs/utils/decorators.pyi +++ b/django-stubs/utils/decorators.pyi @@ -1,9 +1,8 @@ -from typing import Any, Callable, Iterable, Optional, Type, Union, TypeVar +from typing import Any, Callable, Iterable, Optional, Type, TypeVar, Union from django.utils.deprecation import MiddlewareMixin -from django.views.generic.base import View - from django.utils.functional import classproperty as classproperty +from django.views.generic.base import View _T = TypeVar("_T", bound=Union[View, Callable]) # Any callable _CallableType = TypeVar("_CallableType", bound=Callable) diff --git a/django-stubs/utils/encoding.pyi b/django-stubs/utils/encoding.pyi index 75579f8..fcaa220 100644 --- a/django-stubs/utils/encoding.pyi +++ b/django-stubs/utils/encoding.pyi @@ -1,6 +1,6 @@ import datetime from decimal import Decimal -from typing import Any, TypeVar, overload, Union +from typing import Any, TypeVar, Union, overload from django.utils.functional import Promise from typing_extensions import Literal diff --git a/django-stubs/utils/formats.pyi b/django-stubs/utils/formats.pyi index 7bf76d0..5a98d89 100644 --- a/django-stubs/utils/formats.pyi +++ b/django-stubs/utils/formats.pyi @@ -1,4 +1,4 @@ -from datetime import datetime, date, time +from datetime import date, datetime, time from decimal import Decimal from typing import Any, Iterator, List, Optional, Union diff --git a/django-stubs/utils/functional.pyi b/django-stubs/utils/functional.pyi index 954e23d..c2d9b18 100644 --- a/django-stubs/utils/functional.pyi +++ b/django-stubs/utils/functional.pyi @@ -1,5 +1,5 @@ -from typing import Any, Callable, Dict, List, Optional, Tuple, Type, Union, TypeVar, Generic, overload from functools import wraps as wraps # noqa: F401 +from typing import Any, Callable, Dict, Generic, List, Optional, Tuple, Type, TypeVar, Union, overload from django.db.models.base import Model diff --git a/django-stubs/utils/safestring.pyi b/django-stubs/utils/safestring.pyi index fe4cd8f..2123627 100644 --- a/django-stubs/utils/safestring.pyi +++ b/django-stubs/utils/safestring.pyi @@ -1,4 +1,4 @@ -from typing import TypeVar, overload, Callable, Any +from typing import Any, Callable, TypeVar, overload _SD = TypeVar("_SD", bound="SafeData") diff --git a/django-stubs/utils/termcolors.pyi b/django-stubs/utils/termcolors.pyi index 2065a51..8f22bf0 100644 --- a/django-stubs/utils/termcolors.pyi +++ b/django-stubs/utils/termcolors.pyi @@ -1,4 +1,4 @@ -from typing import Any, Callable, Dict, Optional, Tuple, Union, Sequence +from typing import Any, Callable, Dict, Optional, Sequence, Tuple, Union color_names: Any foreground: Any diff --git a/django-stubs/utils/timesince.pyi b/django-stubs/utils/timesince.pyi index 04e5b6a..5846e43 100644 --- a/django-stubs/utils/timesince.pyi +++ b/django-stubs/utils/timesince.pyi @@ -1,5 +1,5 @@ from datetime import date -from typing import Any, Optional, Dict +from typing import Any, Dict, Optional TIME_STRINGS: Dict[str, str] TIMESINCE_CHUNKS: Any diff --git a/django-stubs/utils/timezone.pyi b/django-stubs/utils/timezone.pyi index c61d4a5..b2fbf11 100644 --- a/django-stubs/utils/timezone.pyi +++ b/django-stubs/utils/timezone.pyi @@ -1,7 +1,12 @@ import types from contextlib import ContextDecorator -from datetime import date, datetime as datetime, time, timedelta as timedelta, tzinfo as tzinfo, timezone -from typing import Optional, Union, Type +from datetime import date +from datetime import datetime as datetime +from datetime import time +from datetime import timedelta as timedelta +from datetime import timezone +from datetime import tzinfo as tzinfo +from typing import Optional, Type, Union from pytz import BaseTzInfo diff --git a/django-stubs/utils/topological_sort.pyi b/django-stubs/utils/topological_sort.pyi index 0a537a5..029678e 100644 --- a/django-stubs/utils/topological_sort.pyi +++ b/django-stubs/utils/topological_sort.pyi @@ -1,4 +1,4 @@ -from typing import Any, Dict, Iterator, Set, Container, List +from typing import Any, Container, Dict, Iterator, List, Set class CyclicDependencyError(ValueError): ... diff --git a/django-stubs/utils/translation/__init__.pyi b/django-stubs/utils/translation/__init__.pyi index 53fa38e..30691c5 100644 --- a/django-stubs/utils/translation/__init__.pyi +++ b/django-stubs/utils/translation/__init__.pyi @@ -1,6 +1,6 @@ import functools from contextlib import ContextDecorator -from typing import Any, Optional, Callable, Union +from typing import Any, Callable, Optional, Union from django.core.handlers.wsgi import WSGIRequest diff --git a/django-stubs/utils/translation/trans_real.pyi b/django-stubs/utils/translation/trans_real.pyi index f07e1b2..b0e862a 100644 --- a/django-stubs/utils/translation/trans_real.pyi +++ b/django-stubs/utils/translation/trans_real.pyi @@ -1,7 +1,7 @@ import gettext as gettext_module from collections import OrderedDict from gettext import NullTranslations -from typing import Any, List, Optional, Tuple, Callable +from typing import Any, Callable, List, Optional, Tuple from django.core.handlers.wsgi import WSGIRequest diff --git a/django-stubs/utils/tree.pyi b/django-stubs/utils/tree.pyi index 75a7c7b..83a0534 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, Union, Sequence, List +from typing import Any, Dict, Iterable, List, Optional, Sequence, Tuple, Union from django.db.models.sql.where import NothingNode diff --git a/django-stubs/views/decorators/clickjacking.pyi b/django-stubs/views/decorators/clickjacking.pyi index f93f1ff..1d0e483 100644 --- a/django-stubs/views/decorators/clickjacking.pyi +++ b/django-stubs/views/decorators/clickjacking.pyi @@ -1,4 +1,4 @@ -from typing import Callable, TypeVar, Any +from typing import Any, Callable, TypeVar _F = TypeVar("_F", bound=Callable[..., Any]) diff --git a/django-stubs/views/decorators/gzip.pyi b/django-stubs/views/decorators/gzip.pyi index 7b3766c..7792af7 100644 --- a/django-stubs/views/decorators/gzip.pyi +++ b/django-stubs/views/decorators/gzip.pyi @@ -1,4 +1,4 @@ -from typing import Callable, TypeVar, Any +from typing import Any, Callable, TypeVar _C = TypeVar("_C", bound=Callable[..., Any]) diff --git a/django-stubs/views/generic/__init__.pyi b/django-stubs/views/generic/__init__.pyi index da41605..f8cae74 100644 --- a/django-stubs/views/generic/__init__.pyi +++ b/django-stubs/views/generic/__init__.pyi @@ -1,15 +1,18 @@ -from .base import RedirectView as RedirectView, TemplateView as TemplateView, View as View -from .dates import ( - ArchiveIndexView as ArchiveIndexView, - DateDetailView as DateDetailView, - DayArchiveView as DayArchiveView, - MonthArchiveView as MonthArchiveView, - TodayArchiveView as TodayArchiveView, - WeekArchiveView as WeekArchiveView, - YearArchiveView as YearArchiveView, -) +from .base import RedirectView as RedirectView +from .base import TemplateView as TemplateView +from .base import View as View +from .dates import ArchiveIndexView as ArchiveIndexView +from .dates import DateDetailView as DateDetailView +from .dates import DayArchiveView as DayArchiveView +from .dates import MonthArchiveView as MonthArchiveView +from .dates import TodayArchiveView as TodayArchiveView +from .dates import WeekArchiveView as WeekArchiveView +from .dates import YearArchiveView as YearArchiveView from .detail import DetailView as DetailView -from .edit import CreateView as CreateView, DeleteView as DeleteView, FormView as FormView, UpdateView as UpdateView +from .edit import CreateView as CreateView +from .edit import DeleteView as DeleteView +from .edit import FormView as FormView +from .edit import UpdateView as UpdateView from .list import ListView as ListView class GenericViewError(Exception): ... diff --git a/django-stubs/views/generic/dates.pyi b/django-stubs/views/generic/dates.pyi index 1954981..143a9b8 100644 --- a/django-stubs/views/generic/dates.pyi +++ b/django-stubs/views/generic/dates.pyi @@ -1,13 +1,12 @@ import datetime from typing import Any, Dict, Optional, Sequence, Tuple +from django.db import models +from django.http import HttpRequest, HttpResponse from django.views.generic.base import View from django.views.generic.detail import BaseDetailView, SingleObjectTemplateResponseMixin from django.views.generic.list import MultipleObjectMixin, MultipleObjectTemplateResponseMixin -from django.db import models -from django.http import HttpRequest, HttpResponse - class YearMixin: year_format: str = ... year: Optional[str] = ... diff --git a/django-stubs/views/generic/detail.pyi b/django-stubs/views/generic/detail.pyi index c706d22..16ebe52 100644 --- a/django-stubs/views/generic/detail.pyi +++ b/django-stubs/views/generic/detail.pyi @@ -1,9 +1,8 @@ from typing import Any, Generic, Optional, Type, TypeVar -from django.views.generic.base import ContextMixin, TemplateResponseMixin, View - from django.db import models from django.http import HttpRequest, HttpResponse +from django.views.generic.base import ContextMixin, TemplateResponseMixin, View T = TypeVar("T", bound=models.Model) diff --git a/django-stubs/views/generic/edit.pyi b/django-stubs/views/generic/edit.pyi index eb33341..091a788 100644 --- a/django-stubs/views/generic/edit.pyi +++ b/django-stubs/views/generic/edit.pyi @@ -1,13 +1,12 @@ from typing import Any, Callable, Dict, Generic, Optional, Sequence, Type, TypeVar, Union +from django.db import models from django.forms.forms import BaseForm from django.forms.models import BaseModelForm +from django.http import HttpRequest, HttpResponse from django.views.generic.base import ContextMixin, TemplateResponseMixin, View from django.views.generic.detail import BaseDetailView, SingleObjectMixin, SingleObjectTemplateResponseMixin from typing_extensions import Literal -from django.db import models - -from django.http import HttpRequest, HttpResponse _FormT = TypeVar("_FormT", bound=BaseForm) _ModelFormT = TypeVar("_ModelFormT", bound=BaseModelForm) diff --git a/django-stubs/views/generic/list.pyi b/django-stubs/views/generic/list.pyi index b36046c..6718232 100644 --- a/django-stubs/views/generic/list.pyi +++ b/django-stubs/views/generic/list.pyi @@ -1,11 +1,10 @@ from typing import Any, Generic, Optional, Sequence, Tuple, Type, TypeVar from django.core.paginator import Paginator -from django.db.models.query import QuerySet -from django.views.generic.base import ContextMixin, TemplateResponseMixin, View - from django.db.models import Model +from django.db.models.query import QuerySet from django.http import HttpRequest, HttpResponse +from django.views.generic.base import ContextMixin, TemplateResponseMixin, View T = TypeVar("T", bound=Model) @@ -21,9 +20,7 @@ class MultipleObjectMixin(Generic[T], ContextMixin): ordering: Sequence[str] = ... def get_queryset(self) -> QuerySet[T]: ... def get_ordering(self) -> Sequence[str]: ... - def paginate_queryset( - self, queryset: QuerySet, page_size: int - ) -> Tuple[Paginator, int, QuerySet[T], bool]: ... + def paginate_queryset(self, queryset: QuerySet, page_size: int) -> Tuple[Paginator, int, QuerySet[T], bool]: ... def get_paginate_by(self, queryset: QuerySet) -> Optional[int]: ... def get_paginator( self, queryset: QuerySet, per_page: int, orphans: int = ..., allow_empty_first_page: bool = ..., **kwargs: Any diff --git a/django-stubs/views/i18n.pyi b/django-stubs/views/i18n.pyi index eec1bd9..6a67fb9 100644 --- a/django-stubs/views/i18n.pyi +++ b/django-stubs/views/i18n.pyi @@ -3,7 +3,6 @@ from typing import Any, Callable, Dict, List, Optional, Union from django.http.request import HttpRequest from django.http.response import HttpResponse from django.utils.translation.trans_real import DjangoTranslation - from django.views.generic import View LANGUAGE_QUERY_PARAMETER: str