diff --git a/django-stubs/contrib/admin/exceptions.pyi b/django-stubs/contrib/admin/exceptions.pyi index 8f7dd8b94..cc76ad482 100644 --- a/django-stubs/contrib/admin/exceptions.pyi +++ b/django-stubs/contrib/admin/exceptions.pyi @@ -1,4 +1,4 @@ -from django.core.exceptions import SuspiciousOperation as SuspiciousOperation +from django.core.exceptions import SuspiciousOperation class DisallowedModelAdminLookup(SuspiciousOperation): ... class DisallowedModelAdminToField(SuspiciousOperation): ... diff --git a/django-stubs/contrib/admin/views/main.pyi b/django-stubs/contrib/admin/views/main.pyi index 231788ddf..0dcf0dc54 100644 --- a/django-stubs/contrib/admin/views/main.pyi +++ b/django-stubs/contrib/admin/views/main.pyi @@ -2,8 +2,6 @@ from collections.abc import Callable, Iterable, Sequence from typing import Any from django.contrib.admin.filters import ListFilter -from django.contrib.admin.options import IS_POPUP_VAR as IS_POPUP_VAR # noqa: F401 -from django.contrib.admin.options import TO_FIELD_VAR as TO_FIELD_VAR from django.contrib.admin.options import ModelAdmin, _DisplayT, _ListFilterT from django.db.models.base import Model from django.db.models.expressions import Expression diff --git a/django-stubs/contrib/admindocs/apps.pyi b/django-stubs/contrib/admindocs/apps.pyi index f758414b0..b631b7022 100644 --- a/django-stubs/contrib/admindocs/apps.pyi +++ b/django-stubs/contrib/admindocs/apps.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.apps import AppConfig as AppConfig +from django.apps import AppConfig class AdminDocsConfig(AppConfig): name: str diff --git a/django-stubs/contrib/auth/decorators.pyi b/django-stubs/contrib/auth/decorators.pyi index d4657c302..4fa256d15 100644 --- a/django-stubs/contrib/auth/decorators.pyi +++ b/django-stubs/contrib/auth/decorators.pyi @@ -1,7 +1,6 @@ from collections.abc import Callable, Iterable from typing import TypeVar, overload -from django.contrib.auth import REDIRECT_FIELD_NAME as REDIRECT_FIELD_NAME # noqa: F401 from django.contrib.auth.models import AbstractBaseUser, AnonymousUser from django.http.response import HttpResponseBase diff --git a/django-stubs/contrib/flatpages/apps.pyi b/django-stubs/contrib/flatpages/apps.pyi index f809fe3f0..4cd1a037b 100644 --- a/django-stubs/contrib/flatpages/apps.pyi +++ b/django-stubs/contrib/flatpages/apps.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.apps import AppConfig as AppConfig +from django.apps import AppConfig class FlatPagesConfig(AppConfig): name: str diff --git a/django-stubs/contrib/humanize/apps.pyi b/django-stubs/contrib/humanize/apps.pyi index caf829d7f..9bc3a53be 100644 --- a/django-stubs/contrib/humanize/apps.pyi +++ b/django-stubs/contrib/humanize/apps.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.apps import AppConfig as AppConfig +from django.apps import AppConfig class HumanizeConfig(AppConfig): name: str diff --git a/django-stubs/contrib/humanize/templatetags/humanize.pyi b/django-stubs/contrib/humanize/templatetags/humanize.pyi index 0bc6e2997..9ab333904 100644 --- a/django-stubs/contrib/humanize/templatetags/humanize.pyi +++ b/django-stubs/contrib/humanize/templatetags/humanize.pyi @@ -1,6 +1,5 @@ from collections.abc import Callable -from datetime import date -from datetime import datetime as datetime +from datetime import date, datetime from typing import Any, SupportsInt from django import template diff --git a/django-stubs/contrib/messages/apps.pyi b/django-stubs/contrib/messages/apps.pyi index 221c05510..01513d69f 100644 --- a/django-stubs/contrib/messages/apps.pyi +++ b/django-stubs/contrib/messages/apps.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.apps import AppConfig as AppConfig +from django.apps import AppConfig class MessagesConfig(AppConfig): name: str diff --git a/django-stubs/contrib/postgres/apps.pyi b/django-stubs/contrib/postgres/apps.pyi index d01d21187..9c5f83cb0 100644 --- a/django-stubs/contrib/postgres/apps.pyi +++ b/django-stubs/contrib/postgres/apps.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.apps import AppConfig as AppConfig +from django.apps import AppConfig RANGE_TYPES: Any diff --git a/django-stubs/contrib/postgres/forms/array.pyi b/django-stubs/contrib/postgres/forms/array.pyi index 4ba068404..a1ff8d377 100644 --- a/django-stubs/contrib/postgres/forms/array.pyi +++ b/django-stubs/contrib/postgres/forms/array.pyi @@ -1,10 +1,7 @@ from collections.abc import Sequence from typing import Any -from django import forms as forms -from django.contrib.postgres.validators import ArrayMaxLengthValidator as ArrayMaxLengthValidator -from django.contrib.postgres.validators import ArrayMinLengthValidator as ArrayMinLengthValidator -from django.core.exceptions import ValidationError as ValidationError +from django import forms from django.db.models.fields import _ErrorMessagesT from django.forms.fields import _ClassLevelWidgetT from django.forms.utils import _DataT, _FilesT diff --git a/django-stubs/contrib/postgres/serializers.pyi b/django-stubs/contrib/postgres/serializers.pyi index 5bcc8c355..3aca9ff2d 100644 --- a/django-stubs/contrib/postgres/serializers.pyi +++ b/django-stubs/contrib/postgres/serializers.pyi @@ -1,4 +1,4 @@ -from django.db.migrations.serializer import BaseSerializer as BaseSerializer +from django.db.migrations.serializer import BaseSerializer class RangeSerializer(BaseSerializer): def serialize(self) -> tuple[str, set[str]]: ... diff --git a/django-stubs/contrib/redirects/apps.pyi b/django-stubs/contrib/redirects/apps.pyi index 59f130060..5cf32c2a5 100644 --- a/django-stubs/contrib/redirects/apps.pyi +++ b/django-stubs/contrib/redirects/apps.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.apps import AppConfig as AppConfig +from django.apps import AppConfig class RedirectsConfig(AppConfig): name: str diff --git a/django-stubs/contrib/sessions/apps.pyi b/django-stubs/contrib/sessions/apps.pyi index bd173b2e7..918abc0f8 100644 --- a/django-stubs/contrib/sessions/apps.pyi +++ b/django-stubs/contrib/sessions/apps.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.apps import AppConfig as AppConfig +from django.apps import AppConfig class SessionsConfig(AppConfig): name: str diff --git a/django-stubs/contrib/sitemaps/apps.pyi b/django-stubs/contrib/sitemaps/apps.pyi index 8821366e0..04dee814d 100644 --- a/django-stubs/contrib/sitemaps/apps.pyi +++ b/django-stubs/contrib/sitemaps/apps.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.apps import AppConfig as AppConfig +from django.apps import AppConfig class SiteMapsConfig(AppConfig): name: str diff --git a/django-stubs/contrib/syndication/apps.pyi b/django-stubs/contrib/syndication/apps.pyi index cb727bd92..61acf8648 100644 --- a/django-stubs/contrib/syndication/apps.pyi +++ b/django-stubs/contrib/syndication/apps.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.apps import AppConfig as AppConfig +from django.apps import AppConfig class SyndicationConfig(AppConfig): name: str diff --git a/django-stubs/core/cache/__init__.pyi b/django-stubs/core/cache/__init__.pyi index cf25cd760..24a8d8fa1 100644 --- a/django-stubs/core/cache/__init__.pyi +++ b/django-stubs/core/cache/__init__.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.utils.connection import BaseConnectionHandler, ConnectionProxy +from django.utils.connection import BaseConnectionHandler from .backends.base import BaseCache as BaseCache from .backends.base import CacheKeyWarning as CacheKeyWarning diff --git a/django-stubs/core/handlers/asgi.pyi b/django-stubs/core/handlers/asgi.pyi index 88621620e..f83101063 100644 --- a/django-stubs/core/handlers/asgi.pyi +++ b/django-stubs/core/handlers/asgi.pyi @@ -1,7 +1,7 @@ from collections.abc import Awaitable, Callable, Iterator, Mapping, Sequence from typing import IO, Any, TypeVar -from django.core.handlers import base as base +from django.core.handlers import base from django.http.request import HttpRequest, _ImmutableQueryDict from django.http.response import HttpResponseBase from django.urls.resolvers import ResolverMatch, URLResolver diff --git a/django-stubs/core/management/commands/check.pyi b/django-stubs/core/management/commands/check.pyi index de7918d51..0ebc3a9c2 100644 --- a/django-stubs/core/management/commands/check.pyi +++ b/django-stubs/core/management/commands/check.pyi @@ -1,10 +1,6 @@ from typing import Any -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 -from django.core.management.base import CommandError as CommandError +from django.core.management.base import BaseCommand 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 38da5fe28..e02461341 100644 --- a/django-stubs/core/management/commands/compilemessages.pyi +++ b/django-stubs/core/management/commands/compilemessages.pyi @@ -1,11 +1,6 @@ -import os from pathlib import Path -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 +from django.core.management.base import BaseCommand from django.utils._os import _PathCompatible def has_bom(fn: Path) -> bool: ... diff --git a/django-stubs/core/management/commands/createcachetable.pyi b/django-stubs/core/management/commands/createcachetable.pyi index 211b0512a..20184201d 100644 --- a/django-stubs/core/management/commands/createcachetable.pyi +++ b/django-stubs/core/management/commands/createcachetable.pyi @@ -1,16 +1,6 @@ from typing import Any -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 -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 +from django.core.management.base import BaseCommand class Command(BaseCommand): verbosity: int diff --git a/django-stubs/core/management/commands/dbshell.pyi b/django-stubs/core/management/commands/dbshell.pyi index 7c1fbcc1d..8d75fb4d6 100644 --- a/django-stubs/core/management/commands/dbshell.pyi +++ b/django-stubs/core/management/commands/dbshell.pyi @@ -1,7 +1,3 @@ -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 +from django.core.management.base import BaseCommand class Command(BaseCommand): ... diff --git a/django-stubs/core/management/commands/diffsettings.pyi b/django-stubs/core/management/commands/diffsettings.pyi index 7590990cd..aecacc9cb 100644 --- a/django-stubs/core/management/commands/diffsettings.pyi +++ b/django-stubs/core/management/commands/diffsettings.pyi @@ -1,7 +1,7 @@ from collections.abc import Callable from typing import Any -from django.core.management.base import BaseCommand as BaseCommand +from django.core.management.base import BaseCommand def module_to_dict(module: Any, omittable: Callable[[str], bool] = ...) -> dict[str, str]: ... diff --git a/django-stubs/core/management/commands/flush.pyi b/django-stubs/core/management/commands/flush.pyi index 3ea71fc29..46dac0843 100644 --- a/django-stubs/core/management/commands/flush.pyi +++ b/django-stubs/core/management/commands/flush.pyi @@ -1,12 +1,5 @@ -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.base import BaseCommand 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] diff --git a/django-stubs/core/management/commands/inspectdb.pyi b/django-stubs/core/management/commands/inspectdb.pyi index fd712f938..b9c32701d 100644 --- a/django-stubs/core/management/commands/inspectdb.pyi +++ b/django-stubs/core/management/commands/inspectdb.pyi @@ -1,12 +1,8 @@ from collections.abc import Iterable from typing import Any -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.core.management.base import BaseCommand from django.db.backends.base.base import BaseDatabaseWrapper -from django.db.models.constants import LOOKUP_SEP as LOOKUP_SEP class Command(BaseCommand): stealth_options: tuple[str] diff --git a/django-stubs/core/management/commands/makemigrations.pyi b/django-stubs/core/management/commands/makemigrations.pyi index ff66935c4..c852f65e6 100644 --- a/django-stubs/core/management/commands/makemigrations.pyi +++ b/django-stubs/core/management/commands/makemigrations.pyi @@ -1,23 +1,7 @@ from typing import Any -from django.apps import apps as apps -from django.conf import settings as settings -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 -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 django.core.management.base import BaseCommand +from django.db.migrations.loader import MigrationLoader class Command(BaseCommand): verbosity: int diff --git a/django-stubs/core/management/commands/migrate.pyi b/django-stubs/core/management/commands/migrate.pyi index 786b9c969..b8b88b5c9 100644 --- a/django-stubs/core/management/commands/migrate.pyi +++ b/django-stubs/core/management/commands/migrate.pyi @@ -1,24 +1,9 @@ from collections.abc import Container 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.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.core.management.base import BaseCommand 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 -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 class Command(BaseCommand): verbosity: int diff --git a/django-stubs/core/management/commands/sendtestemail.pyi b/django-stubs/core/management/commands/sendtestemail.pyi index 298564136..c27c67d72 100644 --- a/django-stubs/core/management/commands/sendtestemail.pyi +++ b/django-stubs/core/management/commands/sendtestemail.pyi @@ -1,8 +1,4 @@ -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 +from django.core.management.base import BaseCommand class Command(BaseCommand): missing_args_message: str diff --git a/django-stubs/core/management/commands/shell.pyi b/django-stubs/core/management/commands/shell.pyi index 004b19128..a9fba9a00 100644 --- a/django-stubs/core/management/commands/shell.pyi +++ b/django-stubs/core/management/commands/shell.pyi @@ -1,8 +1,6 @@ from typing import Any -from django.core.management import BaseCommand as BaseCommand -from django.core.management import CommandError as CommandError -from django.utils.datastructures import OrderedSet as OrderedSet +from django.core.management import BaseCommand class Command(BaseCommand): shells: list[str] diff --git a/django-stubs/core/management/commands/showmigrations.pyi b/django-stubs/core/management/commands/showmigrations.pyi index 24cb6dc43..384d156e5 100644 --- a/django-stubs/core/management/commands/showmigrations.pyi +++ b/django-stubs/core/management/commands/showmigrations.pyi @@ -1,11 +1,5 @@ -from typing import Any - -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 -from django.db import connections as connections +from django.core.management.base import BaseCommand from django.db.backends.base.base import BaseDatabaseWrapper -from django.db.migrations.loader import MigrationLoader as MigrationLoader class Command(BaseCommand): verbosity: int diff --git a/django-stubs/core/management/commands/sqlflush.pyi b/django-stubs/core/management/commands/sqlflush.pyi index 3625b9801..99102370b 100644 --- a/django-stubs/core/management/commands/sqlflush.pyi +++ b/django-stubs/core/management/commands/sqlflush.pyi @@ -1,7 +1,4 @@ -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 -from django.db import connections as connections +from django.core.management.base import BaseCommand 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 03bad538d..8608316d0 100644 --- a/django-stubs/core/management/commands/sqlmigrate.pyi +++ b/django-stubs/core/management/commands/sqlmigrate.pyi @@ -1,12 +1,6 @@ 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 +from django.core.management.base import BaseCommand class Command(BaseCommand): output_transaction: bool diff --git a/django-stubs/core/management/commands/sqlsequencereset.pyi b/django-stubs/core/management/commands/sqlsequencereset.pyi index 018ecf4fc..713a16bef 100644 --- a/django-stubs/core/management/commands/sqlsequencereset.pyi +++ b/django-stubs/core/management/commands/sqlsequencereset.pyi @@ -1,5 +1,3 @@ -from django.core.management.base import AppCommand as AppCommand -from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS -from django.db import connections as connections +from django.core.management.base import AppCommand class Command(AppCommand): ... diff --git a/django-stubs/core/management/commands/squashmigrations.pyi b/django-stubs/core/management/commands/squashmigrations.pyi index 77e81e96a..7967da74b 100644 --- a/django-stubs/core/management/commands/squashmigrations.pyi +++ b/django-stubs/core/management/commands/squashmigrations.pyi @@ -1,17 +1,6 @@ -from django.apps import apps as apps -from django.conf import settings as settings -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.core.management.base import BaseCommand +from django.db.migrations.loader import MigrationLoader from django.db.migrations.migration import Migration -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 -from django.utils.version import get_docs_version as get_docs_version class Command(BaseCommand): verbosity: int diff --git a/django-stubs/core/management/commands/startapp.pyi b/django-stubs/core/management/commands/startapp.pyi index e3ace8601..e6c09b0c5 100644 --- a/django-stubs/core/management/commands/startapp.pyi +++ b/django-stubs/core/management/commands/startapp.pyi @@ -1,6 +1,4 @@ -from typing import Any - -from django.core.management.templates import TemplateCommand as TemplateCommand +from django.core.management.templates import 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 34bbfdd34..e6c09b0c5 100644 --- a/django-stubs/core/management/commands/startproject.pyi +++ b/django-stubs/core/management/commands/startproject.pyi @@ -1,6 +1,4 @@ -from django.core.management.templates import TemplateCommand as TemplateCommand - -from ..utils import get_random_secret_key as get_random_secret_key +from django.core.management.templates import TemplateCommand 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 46a90cef8..aeb21e660 100644 --- a/django-stubs/core/management/commands/test.pyi +++ b/django-stubs/core/management/commands/test.pyi @@ -1,9 +1,6 @@ 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 django.core.management.base import BaseCommand class Command(BaseCommand): test_runner: Any diff --git a/django-stubs/core/serializers/xml_serializer.pyi b/django-stubs/core/serializers/xml_serializer.pyi index f21496aa7..05012c5a1 100644 --- a/django-stubs/core/serializers/xml_serializer.pyi +++ b/django-stubs/core/serializers/xml_serializer.pyi @@ -1,7 +1,7 @@ from typing import IO, Any from xml.sax.expatreader import ExpatParser as _ExpatParser -from django.core.serializers import base as base +from django.core.serializers import base class Serializer(base.Serializer): def indent(self, level: int) -> None: ... diff --git a/django-stubs/core/servers/basehttp.pyi b/django-stubs/core/servers/basehttp.pyi index e74c76357..71c255379 100644 --- a/django-stubs/core/servers/basehttp.pyi +++ b/django-stubs/core/servers/basehttp.pyi @@ -4,7 +4,6 @@ from typing import Any from wsgiref import simple_server 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): request_queue_size: int diff --git a/django-stubs/db/__init__.pyi b/django-stubs/db/__init__.pyi index 5633b9eef..abbf88ba9 100644 --- a/django-stubs/db/__init__.pyi +++ b/django-stubs/db/__init__.pyi @@ -1,12 +1,8 @@ from typing import Any -from django.utils.connection import ConnectionProxy - -from . import migrations as 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 diff --git a/django-stubs/db/backends/dummy/features.pyi b/django-stubs/db/backends/dummy/features.pyi index 61142f424..669b40f6f 100644 --- a/django-stubs/db/backends/dummy/features.pyi +++ b/django-stubs/db/backends/dummy/features.pyi @@ -1,4 +1,4 @@ -from django.db.backends.base.features import BaseDatabaseFeatures as BaseDatabaseFeatures +from django.db.backends.base.features import BaseDatabaseFeatures class DummyDatabaseFeatures(BaseDatabaseFeatures): supports_transactions: bool diff --git a/django-stubs/db/backends/mysql/base.pyi b/django-stubs/db/backends/mysql/base.pyi index cfaa370a3..da9a5b80f 100644 --- a/django-stubs/db/backends/mysql/base.pyi +++ b/django-stubs/db/backends/mysql/base.pyi @@ -1,7 +1,7 @@ from collections.abc import Container, Iterator from typing import Any -from django.db.backends.base.base import BaseDatabaseWrapper as BaseDatabaseWrapper +from django.db.backends.base.base import BaseDatabaseWrapper from typing_extensions import Literal from .client import DatabaseClient diff --git a/django-stubs/db/backends/mysql/compiler.pyi b/django-stubs/db/backends/mysql/compiler.pyi index dad64f2b5..299d04fac 100644 --- a/django-stubs/db/backends/mysql/compiler.pyi +++ b/django-stubs/db/backends/mysql/compiler.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.db.models.sql import compiler as compiler +from django.db.models.sql import compiler from django.db.models.sql.compiler import _AsSqlType class SQLCompiler(compiler.SQLCompiler): diff --git a/django-stubs/db/backends/mysql/creation.pyi b/django-stubs/db/backends/mysql/creation.pyi index 76779e418..548c0e116 100644 --- a/django-stubs/db/backends/mysql/creation.pyi +++ b/django-stubs/db/backends/mysql/creation.pyi @@ -1,4 +1,4 @@ -from django.db.backends.base.creation import BaseDatabaseCreation as BaseDatabaseCreation +from django.db.backends.base.creation import BaseDatabaseCreation from django.db.backends.mysql.base import DatabaseWrapper class DatabaseCreation(BaseDatabaseCreation): diff --git a/django-stubs/db/backends/mysql/features.pyi b/django-stubs/db/backends/mysql/features.pyi index d10f0a822..2db617802 100644 --- a/django-stubs/db/backends/mysql/features.pyi +++ b/django-stubs/db/backends/mysql/features.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.db.backends.base.features import BaseDatabaseFeatures as BaseDatabaseFeatures +from django.db.backends.base.features import BaseDatabaseFeatures from django.db.backends.mysql.base import DatabaseWrapper class DatabaseFeatures(BaseDatabaseFeatures): diff --git a/django-stubs/db/backends/mysql/introspection.pyi b/django-stubs/db/backends/mysql/introspection.pyi index 97ca492d0..fa20b4545 100644 --- a/django-stubs/db/backends/mysql/introspection.pyi +++ b/django-stubs/db/backends/mysql/introspection.pyi @@ -1,7 +1,7 @@ from collections import namedtuple from typing import Any -from django.db.backends.base.introspection import BaseDatabaseIntrospection as BaseDatabaseIntrospection +from django.db.backends.base.introspection import BaseDatabaseIntrospection from django.db.backends.mysql.base import DatabaseWrapper FieldInfo: Any diff --git a/django-stubs/db/backends/mysql/operations.pyi b/django-stubs/db/backends/mysql/operations.pyi index 1753677d6..0641b85cc 100644 --- a/django-stubs/db/backends/mysql/operations.pyi +++ b/django-stubs/db/backends/mysql/operations.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.db.backends.base.operations import BaseDatabaseOperations as BaseDatabaseOperations +from django.db.backends.base.operations import BaseDatabaseOperations from django.db.backends.mysql.base import DatabaseWrapper class DatabaseOperations(BaseDatabaseOperations): diff --git a/django-stubs/db/backends/mysql/schema.pyi b/django-stubs/db/backends/mysql/schema.pyi index bc372a08a..e84b4b2de 100644 --- a/django-stubs/db/backends/mysql/schema.pyi +++ b/django-stubs/db/backends/mysql/schema.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.db.backends.base.schema import BaseDatabaseSchemaEditor as BaseDatabaseSchemaEditor +from django.db.backends.base.schema import BaseDatabaseSchemaEditor from django.db.backends.mysql.base import DatabaseWrapper class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): diff --git a/django-stubs/db/backends/mysql/validation.pyi b/django-stubs/db/backends/mysql/validation.pyi index a67255c1c..40b3ce525 100644 --- a/django-stubs/db/backends/mysql/validation.pyi +++ b/django-stubs/db/backends/mysql/validation.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.db.backends.base.validation import BaseDatabaseValidation as BaseDatabaseValidation +from django.db.backends.base.validation import BaseDatabaseValidation from django.db.backends.mysql.base import DatabaseWrapper class DatabaseValidation(BaseDatabaseValidation): diff --git a/django-stubs/db/backends/oracle/base.pyi b/django-stubs/db/backends/oracle/base.pyi index 149d4f10b..2751c31d3 100644 --- a/django-stubs/db/backends/oracle/base.pyi +++ b/django-stubs/db/backends/oracle/base.pyi @@ -2,7 +2,7 @@ from collections.abc import Generator, Iterator from contextlib import contextmanager from typing import Any -from django.db.backends.base.base import BaseDatabaseWrapper as BaseDatabaseWrapper +from django.db.backends.base.base import BaseDatabaseWrapper from .client import DatabaseClient from .creation import DatabaseCreation diff --git a/django-stubs/db/backends/oracle/client.pyi b/django-stubs/db/backends/oracle/client.pyi index 86e3a688f..a8e42a9e9 100644 --- a/django-stubs/db/backends/oracle/client.pyi +++ b/django-stubs/db/backends/oracle/client.pyi @@ -1,7 +1,7 @@ from collections.abc import Iterable from typing import Any -from django.db.backends.base.client import BaseDatabaseClient as BaseDatabaseClient +from django.db.backends.base.client import BaseDatabaseClient from django.db.backends.oracle.base import DatabaseWrapper class DatabaseClient(BaseDatabaseClient): diff --git a/django-stubs/db/backends/oracle/creation.pyi b/django-stubs/db/backends/oracle/creation.pyi index 9a7e74398..2289024ef 100644 --- a/django-stubs/db/backends/oracle/creation.pyi +++ b/django-stubs/db/backends/oracle/creation.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.db.backends.base.creation import BaseDatabaseCreation as BaseDatabaseCreation +from django.db.backends.base.creation import BaseDatabaseCreation from django.db.backends.oracle.base import DatabaseWrapper TEST_DATABASE_PREFIX: str diff --git a/django-stubs/db/backends/oracle/features.pyi b/django-stubs/db/backends/oracle/features.pyi index 540998b44..ce9e27455 100644 --- a/django-stubs/db/backends/oracle/features.pyi +++ b/django-stubs/db/backends/oracle/features.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.db.backends.base.features import BaseDatabaseFeatures as BaseDatabaseFeatures +from django.db.backends.base.features import BaseDatabaseFeatures from django.db.backends.oracle.base import DatabaseWrapper class DatabaseFeatures(BaseDatabaseFeatures): diff --git a/django-stubs/db/backends/oracle/functions.pyi b/django-stubs/db/backends/oracle/functions.pyi index 828a78488..df9fcad92 100644 --- a/django-stubs/db/backends/oracle/functions.pyi +++ b/django-stubs/db/backends/oracle/functions.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.db.models import Func as Func +from django.db.models import Func class IntervalToSeconds(Func): function: str diff --git a/django-stubs/db/backends/oracle/introspection.pyi b/django-stubs/db/backends/oracle/introspection.pyi index 07f07635c..72218b629 100644 --- a/django-stubs/db/backends/oracle/introspection.pyi +++ b/django-stubs/db/backends/oracle/introspection.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.db.backends.base.introspection import BaseDatabaseIntrospection as BaseDatabaseIntrospection +from django.db.backends.base.introspection import BaseDatabaseIntrospection from django.db.backends.oracle.base import DatabaseWrapper FieldInfo: Any diff --git a/django-stubs/db/backends/oracle/operations.pyi b/django-stubs/db/backends/oracle/operations.pyi index b8f0399ab..f3942e0af 100644 --- a/django-stubs/db/backends/oracle/operations.pyi +++ b/django-stubs/db/backends/oracle/operations.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.db.backends.base.operations import BaseDatabaseOperations as BaseDatabaseOperations +from django.db.backends.base.operations import BaseDatabaseOperations from django.db.backends.oracle.base import DatabaseWrapper class DatabaseOperations(BaseDatabaseOperations): diff --git a/django-stubs/db/backends/oracle/schema.pyi b/django-stubs/db/backends/oracle/schema.pyi index e8d940942..ed30a2bc5 100644 --- a/django-stubs/db/backends/oracle/schema.pyi +++ b/django-stubs/db/backends/oracle/schema.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.db.backends.base.schema import BaseDatabaseSchemaEditor as BaseDatabaseSchemaEditor +from django.db.backends.base.schema import BaseDatabaseSchemaEditor from django.db.backends.oracle.base import DatabaseWrapper class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): diff --git a/django-stubs/db/backends/oracle/validation.pyi b/django-stubs/db/backends/oracle/validation.pyi index e69e2e7f5..aef1ac2e6 100644 --- a/django-stubs/db/backends/oracle/validation.pyi +++ b/django-stubs/db/backends/oracle/validation.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.db.backends.base.validation import BaseDatabaseValidation as BaseDatabaseValidation +from django.db.backends.base.validation import BaseDatabaseValidation from django.db.backends.oracle.base import DatabaseWrapper class DatabaseValidation(BaseDatabaseValidation): diff --git a/django-stubs/db/backends/postgresql/features.pyi b/django-stubs/db/backends/postgresql/features.pyi index 7b9b7c929..a38178ba4 100644 --- a/django-stubs/db/backends/postgresql/features.pyi +++ b/django-stubs/db/backends/postgresql/features.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.db.backends.base.features import BaseDatabaseFeatures as BaseDatabaseFeatures +from django.db.backends.base.features import BaseDatabaseFeatures from django.db.backends.postgresql.base import DatabaseWrapper class DatabaseFeatures(BaseDatabaseFeatures): diff --git a/django-stubs/db/backends/postgresql/introspection.pyi b/django-stubs/db/backends/postgresql/introspection.pyi index e6c0aa4c0..5ab5e604b 100644 --- a/django-stubs/db/backends/postgresql/introspection.pyi +++ b/django-stubs/db/backends/postgresql/introspection.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.db.backends.base.introspection import BaseDatabaseIntrospection as BaseDatabaseIntrospection +from django.db.backends.base.introspection import BaseDatabaseIntrospection from django.db.backends.postgresql.base import DatabaseWrapper class DatabaseIntrospection(BaseDatabaseIntrospection): diff --git a/django-stubs/db/backends/postgresql/schema.pyi b/django-stubs/db/backends/postgresql/schema.pyi index 105cee75e..a706c7143 100644 --- a/django-stubs/db/backends/postgresql/schema.pyi +++ b/django-stubs/db/backends/postgresql/schema.pyi @@ -1,6 +1,6 @@ from typing import Any -from django.db.backends.base.schema import BaseDatabaseSchemaEditor as BaseDatabaseSchemaEditor +from django.db.backends.base.schema import BaseDatabaseSchemaEditor from django.db.backends.postgresql.base import DatabaseWrapper class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): diff --git a/django-stubs/db/backends/sqlite3/client.pyi b/django-stubs/db/backends/sqlite3/client.pyi index 4202b37e1..42eb8d801 100644 --- a/django-stubs/db/backends/sqlite3/client.pyi +++ b/django-stubs/db/backends/sqlite3/client.pyi @@ -1,7 +1,7 @@ from collections.abc import Iterable from typing import Any -from django.db.backends.base.client import BaseDatabaseClient as BaseDatabaseClient +from django.db.backends.base.client import BaseDatabaseClient from django.db.backends.sqlite3.base import DatabaseWrapper class DatabaseClient(BaseDatabaseClient): diff --git a/django-stubs/db/models/query.pyi b/django-stubs/db/models/query.pyi index e89699d2f..103eec3da 100644 --- a/django-stubs/db/models/query.pyi +++ b/django-stubs/db/models/query.pyi @@ -5,9 +5,7 @@ from typing import Any, Generic, NamedTuple, TypeVar, overload from _typeshed import Self 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.expressions import Combinable from django.db.models.sql.query import Query, RawQuery from typing_extensions import TypeAlias diff --git a/django-stubs/db/utils.pyi b/django-stubs/db/utils.pyi index 23dabe0d4..a04919a5e 100644 --- a/django-stubs/db/utils.pyi +++ b/django-stubs/db/utils.pyi @@ -6,7 +6,6 @@ from django.apps import AppConfig from django.db.backends.base.base import BaseDatabaseWrapper from django.db.models import Model from django.utils.connection import BaseConnectionHandler -from django.utils.connection import ConnectionDoesNotExist as ConnectionDoesNotExist DEFAULT_DB_ALIAS: str DJANGO_VERSION_PICKLE_KEY: str diff --git a/django-stubs/forms/forms.pyi b/django-stubs/forms/forms.pyi index b061f78ee..6d27695c0 100644 --- a/django-stubs/forms/forms.pyi +++ b/django-stubs/forms/forms.pyi @@ -1,7 +1,7 @@ from collections.abc import Iterable, Iterator, Mapping, Sequence from typing import Any, ClassVar -from django.core.exceptions import ValidationError as ValidationError +from django.core.exceptions import ValidationError from django.forms.boundfield import BoundField from django.forms.fields import Field from django.forms.renderers import BaseRenderer diff --git a/django-stubs/shortcuts.pyi b/django-stubs/shortcuts.pyi index 34aa2b713..2fba0c2c4 100644 --- a/django-stubs/shortcuts.pyi +++ b/django-stubs/shortcuts.pyi @@ -4,9 +4,7 @@ from typing import Any, Protocol, TypeVar, 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 +from django.http.response import HttpResponse, HttpResponsePermanentRedirect, HttpResponseRedirect from typing_extensions import Literal def render( diff --git a/django-stubs/template/base.pyi b/django-stubs/template/base.pyi index d2f5e4530..cf15bc44a 100644 --- a/django-stubs/template/base.pyi +++ b/django-stubs/template/base.pyi @@ -4,7 +4,7 @@ from logging import Logger from re import Pattern from typing import Any -from django.template.context import Context as Context +from django.template.context import Context as Context # noqa: F401 # Django: imported for backwards compatibility from django.template.engine import Engine from django.template.library import Library from django.template.loaders.base import Loader diff --git a/django-stubs/template/defaultfilters.pyi b/django-stubs/template/defaultfilters.pyi index d0a29e474..7eacd3fa7 100644 --- a/django-stubs/template/defaultfilters.pyi +++ b/django-stubs/template/defaultfilters.pyi @@ -4,7 +4,6 @@ from datetime import datetime from datetime import time as _time from typing import Any -from django.utils.html import escape as escape # noqa: F401 from django.utils.safestring import SafeString register: Any diff --git a/django-stubs/template/loader.pyi b/django-stubs/template/loader.pyi index 4722c686c..1e0a3fd83 100644 --- a/django-stubs/template/loader.pyi +++ b/django-stubs/template/loader.pyi @@ -5,7 +5,6 @@ from django.http.request import HttpRequest from django.template.exceptions import TemplateDoesNotExist as TemplateDoesNotExist # noqa: F401 from django.utils.safestring import SafeString -from . import engines as engines # noqa: F401 from .backends.base import _EngineTemplate def get_template(template_name: str, using: str | None = ...) -> _EngineTemplate: ... diff --git a/django-stubs/test/signals.pyi b/django-stubs/test/signals.pyi index cad768176..68162d46b 100644 --- a/django-stubs/test/signals.pyi +++ b/django-stubs/test/signals.pyi @@ -1,7 +1,5 @@ from typing import Any -from django.core.signals import setting_changed as setting_changed # noqa: F401 - template_rendered: Any COMPLEX_OVERRIDE_SETTINGS: Any diff --git a/django-stubs/test/testcases.pyi b/django-stubs/test/testcases.pyi index ced8d84b3..62eac1a1a 100644 --- a/django-stubs/test/testcases.pyi +++ b/django-stubs/test/testcases.pyi @@ -9,7 +9,7 @@ from _typeshed import Self 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 import 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 diff --git a/django-stubs/utils/functional.pyi b/django-stubs/utils/functional.pyi index bad2f7c63..64f8ce3d9 100644 --- a/django-stubs/utils/functional.pyi +++ b/django-stubs/utils/functional.pyi @@ -1,5 +1,4 @@ from collections.abc import Callable, Sequence -from functools import wraps as wraps # noqa: F401 from typing import Any, Generic, Protocol, TypeVar, overload from _typeshed import Self diff --git a/django-stubs/utils/timezone.pyi b/django-stubs/utils/timezone.pyi index 4da8bda5b..f59e727e8 100644 --- a/django-stubs/utils/timezone.pyi +++ b/django-stubs/utils/timezone.pyi @@ -1,10 +1,5 @@ from contextlib import ContextDecorator -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 datetime import date, datetime, time, timedelta, timezone, tzinfo from types import TracebackType from typing import Any, overload diff --git a/django_stubs_ext/django_stubs_ext/patch.py b/django_stubs_ext/django_stubs_ext/patch.py index 66df3103a..fd06e32f9 100644 --- a/django_stubs_ext/django_stubs_ext/patch.py +++ b/django_stubs_ext/django_stubs_ext/patch.py @@ -1,7 +1,7 @@ import builtins from typing import Any, Generic, Iterable, List, Optional, Tuple, Type, TypeVar -from django import VERSION as VERSION +from django import VERSION from django.contrib.admin import ModelAdmin from django.contrib.admin.options import BaseModelAdmin from django.contrib.sitemaps import Sitemap