Remove unintentional re-exports (#1309)

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): ...

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

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

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
 

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

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

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

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

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
 

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

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]]: ...

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

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

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

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

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

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

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: ...

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: ...

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

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): ...

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]: ...
 

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]

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]

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

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

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

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]

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

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

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

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): ...

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

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

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

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

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: ...