Remove wildcard imports (#3469)

aio-libs · Dec 28, 2018 · 7a324fd · 7a324fd
1 parent 2a346da
commit 7a324fd
Show file tree

Hide file tree

Showing 72 changed files with 1,036 additions and 288 deletions.
diff --git a/CHANGES/3468.bugfix b/CHANGES/3468.bugfix
@@ -0,0 +1 @@
+Remove wildcard imports.
diff --git a/aiohttp/__init__.py b/aiohttp/__init__.py
@@ -1,41 +1,216 @@
 __version__ = '4.0.0a0'
 
-# This relies on each of the submodules having an __all__ variable.
-
-from . import hdrs  # noqa
-from .client import *  # noqa
-from .client import ClientSession, ServerFingerprintMismatch  # noqa
-from .cookiejar import *  # noqa
-from .formdata import *  # noqa
-from .helpers import *  # noqa
-from .http import (HttpVersion, HttpVersion10, HttpVersion11,  # noqa
-                   WSMsgType, WSCloseCode, WSMessage, WebSocketError)  # noqa
-from .multipart import *  # noqa
-from .payload import *  # noqa
-from .payload_streamer import *  # noqa
-from .resolver import *  # noqa
-from .signals import *  # noqa
-from .streams import *  # noqa
-from .tracing import *  # noqa
+from typing import Tuple  # noqa
+
+from . import hdrs
+from .client import (
+    BaseConnector,
+    ClientConnectionError,
+    ClientConnectorCertificateError,
+    ClientConnectorError,
+    ClientConnectorSSLError,
+    ClientError,
+    ClientHttpProxyError,
+    ClientOSError,
+    ClientPayloadError,
+    ClientProxyConnectionError,
+    ClientResponse,
+    ClientRequest,
+    ClientResponseError,
+    ClientSSLError,
+    ClientSession,
+    ClientTimeout,
+    ClientWebSocketResponse,
+    ContentTypeError,
+    Fingerprint,
+    InvalidURL,
+    RequestInfo,
+    ServerConnectionError,
+    ServerDisconnectedError,
+    ServerFingerprintMismatch,
+    ServerTimeoutError,
+    TCPConnector,
+    UnixConnector,
+    WSServerHandshakeError,
+    request
+)
+
+from .cookiejar import CookieJar, DummyCookieJar
+from .formdata import FormData
+from .helpers import BasicAuth, ChainMapProxy
+from .http import (
+    HttpVersion,
+    HttpVersion10,
+    HttpVersion11,
+    WSMsgType,
+    WSCloseCode,
+    WSMessage,
+    WebSocketError
+)
+
+from .multipart import (
+    BadContentDispositionHeader,
+    BadContentDispositionParam,
+    BodyPartReader,
+    MultipartReader,
+    MultipartWriter,
+    content_disposition_filename,
+    parse_content_disposition
+)
+
+from .payload import (
+    AsyncIterablePayload,
+    BufferedReaderPayload,
+    BytesIOPayload,
+    BytesPayload,
+    IOBasePayload,
+    JsonPayload,
+    PAYLOAD_REGISTRY,
+    Payload,
+    StringIOPayload,
+    StringPayload,
+    TextIOPayload,
+    get_payload,
+    payload_type
+)
+
+from .payload_streamer import streamer
+
+from .resolver import AsyncResolver, DefaultResolver, ThreadedResolver
+
+from .signals import Signal
+
+from .streams import (
+    DataQueue,
+    EMPTY_PAYLOAD,
+    EofStream,
+    FlowControlDataQueue,
+    StreamReader
+)
+
+from .tracing import (
+    TraceConfig,
+    TraceConnectionCreateEndParams,
+    TraceConnectionCreateStartParams,
+    TraceConnectionQueuedEndParams,
+    TraceConnectionQueuedStartParams,
+    TraceConnectionReuseconnParams,
+    TraceDnsCacheHitParams,
+    TraceDnsCacheMissParams,
+    TraceDnsResolveHostEndParams,
+    TraceDnsResolveHostStartParams,
+    TraceRequestChunkSentParams,
+    TraceRequestEndParams,
+    TraceRequestExceptionParams,
+    TraceRequestRedirectParams,
+    TraceRequestStartParams,
+    TraceResponseChunkReceivedParams
+)
+
+__all__ = (
+    'hdrs',
+    # client
+    'BaseConnector',
+    'ClientConnectionError',
+    'ClientConnectorCertificateError',
+    'ClientConnectorError',
+    'ClientConnectorSSLError',
+    'ClientError',
+    'ClientHttpProxyError',
+    'ClientOSError',
+    'ClientPayloadError',
+    'ClientProxyConnectionError',
+    'ClientResponse',
+    'ClientRequest',
+    'ClientResponseError',
+    'ClientSSLError',
+    'ClientSession',
+    'ClientTimeout',
+    'ClientWebSocketResponse',
+    'ContentTypeError',
+    'Fingerprint',
+    'InvalidURL',
+    'RequestInfo',
+    'ServerConnectionError',
+    'ServerDisconnectedError',
+    'ServerFingerprintMismatch',
+    'ServerTimeoutError',
+    'TCPConnector',
+    'UnixConnector',
+    'WSServerHandshakeError',
+    'request',
+    # cookiejar
+    'CookieJar',
+    'DummyCookieJar',
+    # formdata
+    'FormData',
+    # helpers
+    'BasicAuth',
+    'ChainMapProxy',
+    # http
+    'HttpVersion',
+    'HttpVersion10',
+    'HttpVersion11',
+    'WSMsgType',
+    'WSCloseCode',
+    'WSMessage',
+    'WebSocketError',
+    # multipart
+    'BadContentDispositionHeader',
+    'BadContentDispositionParam',
+    'BodyPartReader',
+    'MultipartReader',
+    'MultipartWriter',
+    'content_disposition_filename',
+    'parse_content_disposition',
+    # payload
+    'AsyncIterablePayload',
+    'BufferedReaderPayload',
+    'BytesIOPayload',
+    'BytesPayload',
+    'IOBasePayload',
+    'JsonPayload',
+    'PAYLOAD_REGISTRY',
+    'Payload',
+    'StringIOPayload',
+    'StringPayload',
+    'TextIOPayload',
+    'get_payload',
+    'payload_type',
+    # payload_streamer
+    'streamer',
+    # resolver
+    'AsyncResolver',
+    'DefaultResolver',
+    'ThreadedResolver',
+    # signals
+    'Signal',
+    'DataQueue',
+    'EMPTY_PAYLOAD',
+    'EofStream',
+    'FlowControlDataQueue',
+    'StreamReader',
+    # tracing
+    'TraceConfig',
+    'TraceConnectionCreateEndParams',
+    'TraceConnectionCreateStartParams',
+    'TraceConnectionQueuedEndParams',
+    'TraceConnectionQueuedStartParams',
+    'TraceConnectionReuseconnParams',
+    'TraceDnsCacheHitParams',
+    'TraceDnsCacheMissParams',
+    'TraceDnsResolveHostEndParams',
+    'TraceDnsResolveHostStartParams',
+    'TraceRequestChunkSentParams',
+    'TraceRequestEndParams',
+    'TraceRequestExceptionParams',
+    'TraceRequestRedirectParams',
+    'TraceRequestStartParams',
+    'TraceResponseChunkReceivedParams',
+)  # type: Tuple[str, ...]
 
 try:
     from .worker import GunicornWebWorker, GunicornUVLoopWebWorker  # noqa
-    workers = ('GunicornWebWorker', 'GunicornUVLoopWebWorker')
+    __all__ += ('GunicornWebWorker', 'GunicornUVLoopWebWorker')
 except ImportError:  # pragma: no cover
-    workers = ()  # type: ignore
-
-
-__all__ = (client.__all__ +  # noqa
-           cookiejar.__all__ +  # noqa
-           formdata.__all__ +  # noqa
-           helpers.__all__ +  # noqa
-           multipart.__all__ +  # noqa
-           payload.__all__ +  # noqa
-           payload_streamer.__all__ +  # noqa
-           streams.__all__ +  # noqa
-           signals.__all__ +  # noqa
-           tracing.__all__ + # noqa
-           ('hdrs', 'HttpVersion', 'HttpVersion10', 'HttpVersion11',
-            'WSMsgType', 'WSCloseCode',
-            'WebSocketError', 'WSMessage',
-           ) + workers)
+    pass
diff --git a/aiohttp/abc.py b/aiohttp/abc.py
@@ -3,16 +3,25 @@
 from abc import ABC, abstractmethod
 from collections.abc import Sized
 from http.cookies import BaseCookie, Morsel  # noqa
-from typing import (TYPE_CHECKING, Any, Awaitable, Callable, Dict, Generator,
-                    Iterable, List, Optional, Tuple)
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Awaitable,
+    Callable,
+    Dict,
+    Generator,
+    Iterable,
+    List,
+    Optional,
+    Tuple,
+)
 
 from multidict import CIMultiDict  # noqa
 from yarl import URL
 
 from .helpers import get_running_loop
 from .typedefs import LooseCookies
 
-
 if TYPE_CHECKING:  # pragma: no cover
     from .web_request import BaseRequest, Request
     from .web_response import StreamResponse