Skip to content

Commit cf8c0a6

Browse files
authored
Remove unintentional re-exports (#1309)
1 parent 0bb7dbb commit cf8c0a6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+66
-199
lines changed
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from django.core.exceptions import SuspiciousOperation as SuspiciousOperation
1+
from django.core.exceptions import SuspiciousOperation
22

33
class DisallowedModelAdminLookup(SuspiciousOperation): ...
44
class DisallowedModelAdminToField(SuspiciousOperation): ...

django-stubs/contrib/admin/views/main.pyi

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ from collections.abc import Callable, Iterable, Sequence
22
from typing import Any
33

44
from django.contrib.admin.filters import ListFilter
5-
from django.contrib.admin.options import IS_POPUP_VAR as IS_POPUP_VAR # noqa: F401
6-
from django.contrib.admin.options import TO_FIELD_VAR as TO_FIELD_VAR
75
from django.contrib.admin.options import ModelAdmin, _DisplayT, _ListFilterT
86
from django.db.models.base import Model
97
from django.db.models.expressions import Expression

django-stubs/contrib/admindocs/apps.pyi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from typing import Any
22

3-
from django.apps import AppConfig as AppConfig
3+
from django.apps import AppConfig
44

55
class AdminDocsConfig(AppConfig):
66
name: str

django-stubs/contrib/auth/decorators.pyi

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from collections.abc import Callable, Iterable
22
from typing import TypeVar, overload
33

4-
from django.contrib.auth import REDIRECT_FIELD_NAME as REDIRECT_FIELD_NAME # noqa: F401
54
from django.contrib.auth.models import AbstractBaseUser, AnonymousUser
65
from django.http.response import HttpResponseBase
76

django-stubs/contrib/flatpages/apps.pyi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from typing import Any
22

3-
from django.apps import AppConfig as AppConfig
3+
from django.apps import AppConfig
44

55
class FlatPagesConfig(AppConfig):
66
name: str

django-stubs/contrib/humanize/apps.pyi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from typing import Any
22

3-
from django.apps import AppConfig as AppConfig
3+
from django.apps import AppConfig
44

55
class HumanizeConfig(AppConfig):
66
name: str

django-stubs/contrib/humanize/templatetags/humanize.pyi

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from collections.abc import Callable
2-
from datetime import date
3-
from datetime import datetime as datetime
2+
from datetime import date, datetime
43
from typing import Any, SupportsInt
54

65
from django import template

django-stubs/contrib/messages/apps.pyi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from typing import Any
22

3-
from django.apps import AppConfig as AppConfig
3+
from django.apps import AppConfig
44

55
class MessagesConfig(AppConfig):
66
name: str

django-stubs/contrib/postgres/apps.pyi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from typing import Any
22

3-
from django.apps import AppConfig as AppConfig
3+
from django.apps import AppConfig
44

55
RANGE_TYPES: Any
66

django-stubs/contrib/postgres/forms/array.pyi

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
from collections.abc import Sequence
22
from typing import Any
33

4-
from django import forms as forms
5-
from django.contrib.postgres.validators import ArrayMaxLengthValidator as ArrayMaxLengthValidator
6-
from django.contrib.postgres.validators import ArrayMinLengthValidator as ArrayMinLengthValidator
7-
from django.core.exceptions import ValidationError as ValidationError
4+
from django import forms
85
from django.db.models.fields import _ErrorMessagesT
96
from django.forms.fields import _ClassLevelWidgetT
107
from django.forms.utils import _DataT, _FilesT
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from django.db.migrations.serializer import BaseSerializer as BaseSerializer
1+
from django.db.migrations.serializer import BaseSerializer
22

33
class RangeSerializer(BaseSerializer):
44
def serialize(self) -> tuple[str, set[str]]: ...

django-stubs/contrib/redirects/apps.pyi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from typing import Any
22

3-
from django.apps import AppConfig as AppConfig
3+
from django.apps import AppConfig
44

55
class RedirectsConfig(AppConfig):
66
name: str

django-stubs/contrib/sessions/apps.pyi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from typing import Any
22

3-
from django.apps import AppConfig as AppConfig
3+
from django.apps import AppConfig
44

55
class SessionsConfig(AppConfig):
66
name: str

django-stubs/contrib/sitemaps/apps.pyi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from typing import Any
22

3-
from django.apps import AppConfig as AppConfig
3+
from django.apps import AppConfig
44

55
class SiteMapsConfig(AppConfig):
66
name: str

django-stubs/contrib/syndication/apps.pyi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from typing import Any
22

3-
from django.apps import AppConfig as AppConfig
3+
from django.apps import AppConfig
44

55
class SyndicationConfig(AppConfig):
66
name: str

django-stubs/core/cache/__init__.pyi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from typing import Any
22

3-
from django.utils.connection import BaseConnectionHandler, ConnectionProxy
3+
from django.utils.connection import BaseConnectionHandler
44

55
from .backends.base import BaseCache as BaseCache
66
from .backends.base import CacheKeyWarning as CacheKeyWarning

django-stubs/core/handlers/asgi.pyi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from collections.abc import Awaitable, Callable, Iterator, Mapping, Sequence
22
from typing import IO, Any, TypeVar
33

4-
from django.core.handlers import base as base
4+
from django.core.handlers import base
55
from django.http.request import HttpRequest, _ImmutableQueryDict
66
from django.http.response import HttpResponseBase
77
from django.urls.resolvers import ResolverMatch, URLResolver
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
from typing import Any
22

3-
from django.apps import apps as apps
4-
from django.core import checks as checks
5-
from django.core.checks.registry import registry as registry
6-
from django.core.management.base import BaseCommand as BaseCommand
7-
from django.core.management.base import CommandError as CommandError
3+
from django.core.management.base import BaseCommand
84

95
class Command(BaseCommand):
106
def handle(self, *app_labels: list[str], **options: Any) -> None: ...

django-stubs/core/management/commands/compilemessages.pyi

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
import os
21
from pathlib import Path
32

4-
from django.core.management.base import BaseCommand as BaseCommand
5-
from django.core.management.base import CommandError as CommandError
6-
from django.core.management.base import CommandParser as CommandParser
7-
from django.core.management.utils import find_command as find_command
8-
from django.core.management.utils import popen_wrapper as popen_wrapper
3+
from django.core.management.base import BaseCommand
94
from django.utils._os import _PathCompatible
105

116
def has_bom(fn: Path) -> bool: ...

django-stubs/core/management/commands/createcachetable.pyi

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
from typing import Any
22

3-
from django.conf import settings as settings
4-
from django.core.cache import caches as caches
5-
from django.core.cache.backends.db import BaseDatabaseCache as BaseDatabaseCache
6-
from django.core.management.base import BaseCommand as BaseCommand
7-
from django.core.management.base import CommandError as CommandError
8-
from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS
9-
from django.db import DatabaseError as DatabaseError
10-
from django.db import connections as connections
11-
from django.db import models as models
12-
from django.db import router as router
13-
from django.db import transaction as transaction
3+
from django.core.management.base import BaseCommand
144

155
class Command(BaseCommand):
166
verbosity: int
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
from django.core.management.base import BaseCommand as BaseCommand
2-
from django.core.management.base import CommandError as CommandError
3-
from django.core.management.base import CommandParser as CommandParser
4-
from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS
5-
from django.db import connections as connections
1+
from django.core.management.base import BaseCommand
62

73
class Command(BaseCommand): ...

django-stubs/core/management/commands/diffsettings.pyi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from collections.abc import Callable
22
from typing import Any
33

4-
from django.core.management.base import BaseCommand as BaseCommand
4+
from django.core.management.base import BaseCommand
55

66
def module_to_dict(module: Any, omittable: Callable[[str], bool] = ...) -> dict[str, str]: ...
77

django-stubs/core/management/commands/flush.pyi

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
1-
from django.apps import apps as apps
2-
from django.core.management.base import BaseCommand as BaseCommand
3-
from django.core.management.base import CommandError as CommandError
1+
from django.core.management.base import BaseCommand
42
from django.core.management.color import Style
5-
from django.core.management.color import no_style as no_style
6-
from django.core.management.sql import emit_post_migrate_signal as emit_post_migrate_signal
7-
from django.core.management.sql import sql_flush as sql_flush
8-
from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS
9-
from django.db import connections as connections
103

114
class Command(BaseCommand):
125
stealth_options: tuple[str]

django-stubs/core/management/commands/inspectdb.pyi

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
from collections.abc import Iterable
22
from typing import Any
33

4-
from django.core.management.base import BaseCommand as BaseCommand
5-
from django.core.management.base import CommandError as CommandError
6-
from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS
7-
from django.db import connections as connections
4+
from django.core.management.base import BaseCommand
85
from django.db.backends.base.base import BaseDatabaseWrapper
9-
from django.db.models.constants import LOOKUP_SEP as LOOKUP_SEP
106

117
class Command(BaseCommand):
128
stealth_options: tuple[str]

django-stubs/core/management/commands/makemigrations.pyi

+2-18
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
11
from typing import Any
22

3-
from django.apps import apps as apps
4-
from django.conf import settings as settings
5-
from django.core.management.base import BaseCommand as BaseCommand
6-
from django.core.management.base import CommandError as CommandError
7-
from django.core.management.base import no_translations as no_translations
8-
from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS
9-
from django.db import OperationalError as OperationalError
10-
from django.db import connections as connections
11-
from django.db import router as router
12-
from django.db.migrations import Migration as Migration
13-
from django.db.migrations.autodetector import MigrationAutodetector as MigrationAutodetector
14-
from django.db.migrations.loader import MigrationLoader as MigrationLoader
15-
from django.db.migrations.questioner import InteractiveMigrationQuestioner as InteractiveMigrationQuestioner
16-
from django.db.migrations.questioner import MigrationQuestioner as MigrationQuestioner
17-
from django.db.migrations.questioner import NonInteractiveMigrationQuestioner as NonInteractiveMigrationQuestioner
18-
from django.db.migrations.state import ProjectState as ProjectState
19-
from django.db.migrations.utils import get_migration_name_timestamp as get_migration_name_timestamp
20-
from django.db.migrations.writer import MigrationWriter as MigrationWriter
3+
from django.core.management.base import BaseCommand
4+
from django.db.migrations.loader import MigrationLoader
215

226
class Command(BaseCommand):
237
verbosity: int

django-stubs/core/management/commands/migrate.pyi

+1-16
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
11
from collections.abc import Container
22
from typing import Any
33

4-
from django.apps import apps as apps
5-
from django.core.management.base import BaseCommand as BaseCommand
6-
from django.core.management.base import CommandError as CommandError
7-
from django.core.management.base import no_translations as no_translations
8-
from django.core.management.sql import emit_post_migrate_signal as emit_post_migrate_signal
9-
from django.core.management.sql import emit_pre_migrate_signal as emit_pre_migrate_signal
10-
from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS
11-
from django.db import connections as connections
12-
from django.db import router as router
4+
from django.core.management.base import BaseCommand
135
from django.db.backends.base.base import BaseDatabaseWrapper
14-
from django.db.migrations.autodetector import MigrationAutodetector as MigrationAutodetector
15-
from django.db.migrations.executor import MigrationExecutor as MigrationExecutor
16-
from django.db.migrations.loader import AmbiguityError as AmbiguityError
176
from django.db.migrations.operations.base import Operation
18-
from django.db.migrations.state import ModelState as ModelState
19-
from django.db.migrations.state import ProjectState as ProjectState
20-
from django.utils.module_loading import module_has_submodule as module_has_submodule
21-
from django.utils.text import Truncator as Truncator
227

238
class Command(BaseCommand):
249
verbosity: int
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
from django.core.mail import mail_admins as mail_admins
2-
from django.core.mail import mail_managers as mail_managers
3-
from django.core.mail import send_mail as send_mail
4-
from django.core.management.base import BaseCommand as BaseCommand
5-
from django.utils import timezone as timezone
1+
from django.core.management.base import BaseCommand
62

73
class Command(BaseCommand):
84
missing_args_message: str

django-stubs/core/management/commands/shell.pyi

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
from typing import Any
22

3-
from django.core.management import BaseCommand as BaseCommand
4-
from django.core.management import CommandError as CommandError
5-
from django.utils.datastructures import OrderedSet as OrderedSet
3+
from django.core.management import BaseCommand
64

75
class Command(BaseCommand):
86
shells: list[str]

django-stubs/core/management/commands/showmigrations.pyi

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
from typing import Any
2-
3-
from django.apps import apps as apps
4-
from django.core.management.base import BaseCommand as BaseCommand
5-
from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS
6-
from django.db import connections as connections
1+
from django.core.management.base import BaseCommand
72
from django.db.backends.base.base import BaseDatabaseWrapper
8-
from django.db.migrations.loader import MigrationLoader as MigrationLoader
93

104
class Command(BaseCommand):
115
verbosity: int
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
from django.core.management.base import BaseCommand as BaseCommand
2-
from django.core.management.sql import sql_flush as sql_flush
3-
from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS
4-
from django.db import connections as connections
1+
from django.core.management.base import BaseCommand
52

63
class Command(BaseCommand):
74
output_transaction: bool

django-stubs/core/management/commands/sqlmigrate.pyi

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
from typing import Any
22

3-
from django.apps import apps as apps
4-
from django.core.management.base import BaseCommand as BaseCommand
5-
from django.core.management.base import CommandError as CommandError
6-
from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS
7-
from django.db import connections as connections
8-
from django.db.migrations.loader import AmbiguityError as AmbiguityError
9-
from django.db.migrations.loader import MigrationLoader as MigrationLoader
3+
from django.core.management.base import BaseCommand
104

115
class Command(BaseCommand):
126
output_transaction: bool
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from django.core.management.base import AppCommand as AppCommand
2-
from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS
3-
from django.db import connections as connections
1+
from django.core.management.base import AppCommand
42

53
class Command(AppCommand): ...

django-stubs/core/management/commands/squashmigrations.pyi

+2-13
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
1-
from django.apps import apps as apps
2-
from django.conf import settings as settings
3-
from django.core.management.base import BaseCommand as BaseCommand
4-
from django.core.management.base import CommandError as CommandError
5-
from django.db import DEFAULT_DB_ALIAS as DEFAULT_DB_ALIAS
6-
from django.db import connections as connections
7-
from django.db import migrations as migrations
8-
from django.db.migrations.loader import AmbiguityError as AmbiguityError
9-
from django.db.migrations.loader import MigrationLoader as MigrationLoader
1+
from django.core.management.base import BaseCommand
2+
from django.db.migrations.loader import MigrationLoader
103
from django.db.migrations.migration import Migration
11-
from django.db.migrations.migration import SwappableTuple as SwappableTuple
12-
from django.db.migrations.optimizer import MigrationOptimizer as MigrationOptimizer
13-
from django.db.migrations.writer import MigrationWriter as MigrationWriter
14-
from django.utils.version import get_docs_version as get_docs_version
154

165
class Command(BaseCommand):
176
verbosity: int
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
from typing import Any
2-
3-
from django.core.management.templates import TemplateCommand as TemplateCommand
1+
from django.core.management.templates import TemplateCommand
42

53
class Command(TemplateCommand):
64
missing_args_message: str
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
from django.core.management.templates import TemplateCommand as TemplateCommand
2-
3-
from ..utils import get_random_secret_key as get_random_secret_key
1+
from django.core.management.templates import TemplateCommand
42

53
class Command(TemplateCommand):
64
missing_args_message: str

django-stubs/core/management/commands/test.pyi

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
from typing import Any
22

3-
from django.conf import settings as settings
4-
from django.core.management.base import BaseCommand as BaseCommand
5-
from django.core.management.utils import get_command_line_option as get_command_line_option
6-
from django.test.utils import get_runner as get_runner
3+
from django.core.management.base import BaseCommand
74

85
class Command(BaseCommand):
96
test_runner: Any

django-stubs/core/serializers/xml_serializer.pyi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from typing import IO, Any
22
from xml.sax.expatreader import ExpatParser as _ExpatParser
33

4-
from django.core.serializers import base as base
4+
from django.core.serializers import base
55

66
class Serializer(base.Serializer):
77
def indent(self, level: int) -> None: ...

0 commit comments

Comments
 (0)