Use correct style for re-exported imports (#3872)

CHANGES/3868.bugfix

@@ -0,0 +1 @@
+Use correct style for re-exported imports, makes mypy ``--strict`` mode happy.

CONTRIBUTORS.txt

@@ -75,6 +75,7 @@ Diogo Dutra da Mata
 Dmitriy Safonov
 Dmitry Doroshev
 Dmitry Lukashin
+Dmitry Marakasov
 Dmitry Shamov
 Dmitry Trofimov
 Dmytro Bohomiakov

aiohttp/__init__.py

@@ -2,102 +2,116 @@
 
 from typing import Tuple  # noqa
 
-from . import hdrs
+from . import hdrs as hdrs
+from .client import BaseConnector as BaseConnector
+from .client import ClientConnectionError as ClientConnectionError
 from .client import (
-    BaseConnector,
-    ClientConnectionError,
-    ClientConnectorCertificateError,
-    ClientConnectorError,
-    ClientConnectorSSLError,
-    ClientError,
-    ClientHttpProxyError,
-    ClientOSError,
-    ClientPayloadError,
-    ClientProxyConnectionError,
-    ClientRequest,
-    ClientResponse,
-    ClientResponseError,
-    ClientSession,
-    ClientSSLError,
-    ClientTimeout,
-    ClientWebSocketResponse,
-    ContentTypeError,
-    Fingerprint,
-    InvalidURL,
-    NamedPipeConnector,
-    RequestInfo,
-    ServerConnectionError,
-    ServerDisconnectedError,
-    ServerFingerprintMismatch,
-    ServerTimeoutError,
-    TCPConnector,
-    TooManyRedirects,
-    UnixConnector,
-    WSServerHandshakeError,
-    request,
+    ClientConnectorCertificateError as ClientConnectorCertificateError,
 )
-from .cookiejar import CookieJar, DummyCookieJar
-from .formdata import FormData
-from .helpers import BasicAuth, ChainMapProxy
-from .http import (
-    HttpVersion,
-    HttpVersion10,
-    HttpVersion11,
-    WebSocketError,
-    WSCloseCode,
-    WSMessage,
-    WSMsgType,
+from .client import ClientConnectorError as ClientConnectorError
+from .client import ClientConnectorSSLError as ClientConnectorSSLError
+from .client import ClientError as ClientError
+from .client import ClientHttpProxyError as ClientHttpProxyError
+from .client import ClientOSError as ClientOSError
+from .client import ClientPayloadError as ClientPayloadError
+from .client import ClientProxyConnectionError as ClientProxyConnectionError
+from .client import ClientRequest as ClientRequest
+from .client import ClientResponse as ClientResponse
+from .client import ClientResponseError as ClientResponseError
+from .client import ClientSession as ClientSession
+from .client import ClientSSLError as ClientSSLError
+from .client import ClientTimeout as ClientTimeout
+from .client import ClientWebSocketResponse as ClientWebSocketResponse
+from .client import ContentTypeError as ContentTypeError
+from .client import Fingerprint as Fingerprint
+from .client import InvalidURL as InvalidURL
+from .client import NamedPipeConnector as NamedPipeConnector
+from .client import RequestInfo as RequestInfo
+from .client import ServerConnectionError as ServerConnectionError
+from .client import ServerDisconnectedError as ServerDisconnectedError
+from .client import ServerFingerprintMismatch as ServerFingerprintMismatch
+from .client import ServerTimeoutError as ServerTimeoutError
+from .client import TCPConnector as TCPConnector
+from .client import TooManyRedirects as TooManyRedirects
+from .client import UnixConnector as UnixConnector
+from .client import WSServerHandshakeError as WSServerHandshakeError
+from .client import request as request
+from .cookiejar import CookieJar as CookieJar
+from .cookiejar import DummyCookieJar as DummyCookieJar
+from .formdata import FormData as FormData
+from .helpers import BasicAuth as BasicAuth
+from .helpers import ChainMapProxy as ChainMapProxy
+from .http import HttpVersion as HttpVersion
+from .http import HttpVersion10 as HttpVersion10
+from .http import HttpVersion11 as HttpVersion11
+from .http import WebSocketError as WebSocketError
+from .http import WSCloseCode as WSCloseCode
+from .http import WSMessage as WSMessage
+from .http import WSMsgType as WSMsgType
+from .multipart import (
+    BadContentDispositionHeader as BadContentDispositionHeader,
 )
+from .multipart import BadContentDispositionParam as BadContentDispositionParam
+from .multipart import BodyPartReader as BodyPartReader
+from .multipart import MultipartReader as MultipartReader
+from .multipart import MultipartWriter as MultipartWriter
 from .multipart import (
-    BadContentDispositionHeader,
-    BadContentDispositionParam,
-    BodyPartReader,
-    MultipartReader,
-    MultipartWriter,
-    content_disposition_filename,
-    parse_content_disposition,
+    content_disposition_filename as content_disposition_filename,
+)
+from .multipart import parse_content_disposition as parse_content_disposition
+from .payload import PAYLOAD_REGISTRY as PAYLOAD_REGISTRY
+from .payload import AsyncIterablePayload as AsyncIterablePayload
+from .payload import BufferedReaderPayload as BufferedReaderPayload
+from .payload import BytesIOPayload as BytesIOPayload
+from .payload import BytesPayload as BytesPayload
+from .payload import IOBasePayload as IOBasePayload
+from .payload import JsonPayload as JsonPayload
+from .payload import Payload as Payload
+from .payload import StringIOPayload as StringIOPayload
+from .payload import StringPayload as StringPayload
+from .payload import TextIOPayload as TextIOPayload
+from .payload import get_payload as get_payload
+from .payload import payload_type as payload_type
+from .resolver import AsyncResolver as AsyncResolver
+from .resolver import DefaultResolver as DefaultResolver
+from .resolver import ThreadedResolver as ThreadedResolver
+from .signals import Signal as Signal
+from .streams import EMPTY_PAYLOAD as EMPTY_PAYLOAD
+from .streams import DataQueue as DataQueue
+from .streams import EofStream as EofStream
+from .streams import FlowControlDataQueue as FlowControlDataQueue
+from .streams import StreamReader as StreamReader
+from .tracing import TraceConfig as TraceConfig
+from .tracing import (
+    TraceConnectionCreateEndParams as TraceConnectionCreateEndParams,
 )
-from .payload import (
-    PAYLOAD_REGISTRY,
-    AsyncIterablePayload,
-    BufferedReaderPayload,
-    BytesIOPayload,
-    BytesPayload,
-    IOBasePayload,
-    JsonPayload,
-    Payload,
-    StringIOPayload,
-    StringPayload,
-    TextIOPayload,
-    get_payload,
-    payload_type,
+from .tracing import (
+    TraceConnectionCreateStartParams as TraceConnectionCreateStartParams,
 )
-from .resolver import AsyncResolver, DefaultResolver, ThreadedResolver
-from .signals import Signal
-from .streams import (
-    EMPTY_PAYLOAD,
-    DataQueue,
-    EofStream,
-    FlowControlDataQueue,
-    StreamReader,
+from .tracing import (
+    TraceConnectionQueuedEndParams as TraceConnectionQueuedEndParams,
+)
+from .tracing import (
+    TraceConnectionQueuedStartParams as TraceConnectionQueuedStartParams,
+)
+from .tracing import (
+    TraceConnectionReuseconnParams as TraceConnectionReuseconnParams,
+)
+from .tracing import TraceDnsCacheHitParams as TraceDnsCacheHitParams
+from .tracing import TraceDnsCacheMissParams as TraceDnsCacheMissParams
+from .tracing import (
+    TraceDnsResolveHostEndParams as TraceDnsResolveHostEndParams,
+)
+from .tracing import (
+    TraceDnsResolveHostStartParams as TraceDnsResolveHostStartParams,
 )
+from .tracing import TraceRequestChunkSentParams as TraceRequestChunkSentParams
+from .tracing import TraceRequestEndParams as TraceRequestEndParams
+from .tracing import TraceRequestExceptionParams as TraceRequestExceptionParams
+from .tracing import TraceRequestRedirectParams as TraceRequestRedirectParams
+from .tracing import TraceRequestStartParams as TraceRequestStartParams
 from .tracing import (
-    TraceConfig,
-    TraceConnectionCreateEndParams,
-    TraceConnectionCreateStartParams,
-    TraceConnectionQueuedEndParams,
-    TraceConnectionQueuedStartParams,
-    TraceConnectionReuseconnParams,
-    TraceDnsCacheHitParams,
-    TraceDnsCacheMissParams,
-    TraceDnsResolveHostEndParams,
-    TraceDnsResolveHostStartParams,
-    TraceRequestChunkSentParams,
-    TraceRequestEndParams,
-    TraceRequestExceptionParams,
-    TraceRequestRedirectParams,
-    TraceRequestStartParams,
-    TraceResponseChunkReceivedParams,
+    TraceResponseChunkReceivedParams as TraceResponseChunkReceivedParams,
 )
 
 __all__ = (

aiohttp/client.py

@@ -31,41 +31,45 @@
 
 from . import hdrs, http, payload
 from .abc import AbstractCookieJar
+from .client_exceptions import ClientConnectionError as ClientConnectionError
 from .client_exceptions import (
-    ClientConnectionError,
-    ClientConnectorCertificateError,
-    ClientConnectorError,
-    ClientConnectorSSLError,
-    ClientError,
-    ClientHttpProxyError,
-    ClientOSError,
-    ClientPayloadError,
-    ClientProxyConnectionError,
-    ClientResponseError,
-    ClientSSLError,
-    ContentTypeError,
-    InvalidURL,
-    ServerConnectionError,
-    ServerDisconnectedError,
-    ServerFingerprintMismatch,
-    ServerTimeoutError,
-    TooManyRedirects,
-    WSServerHandshakeError,
+    ClientConnectorCertificateError as ClientConnectorCertificateError,
 )
-from .client_reqrep import (
-    SSL_ALLOWED_TYPES,
-    ClientRequest,
-    ClientResponse,
-    Fingerprint,
-    RequestInfo,
+from .client_exceptions import ClientConnectorError as ClientConnectorError
+from .client_exceptions import (
+    ClientConnectorSSLError as ClientConnectorSSLError,
+)
+from .client_exceptions import ClientError as ClientError
+from .client_exceptions import ClientHttpProxyError as ClientHttpProxyError
+from .client_exceptions import ClientOSError as ClientOSError
+from .client_exceptions import ClientPayloadError as ClientPayloadError
+from .client_exceptions import (
+    ClientProxyConnectionError as ClientProxyConnectionError,
 )
-from .client_ws import ClientWebSocketResponse
-from .connector import (
-    BaseConnector,
-    NamedPipeConnector,
-    TCPConnector,
-    UnixConnector,
+from .client_exceptions import ClientResponseError as ClientResponseError
+from .client_exceptions import ClientSSLError as ClientSSLError
+from .client_exceptions import ContentTypeError as ContentTypeError
+from .client_exceptions import InvalidURL as InvalidURL
+from .client_exceptions import ServerConnectionError as ServerConnectionError
+from .client_exceptions import (
+    ServerDisconnectedError as ServerDisconnectedError,
+)
+from .client_exceptions import (
+    ServerFingerprintMismatch as ServerFingerprintMismatch,
 )
+from .client_exceptions import ServerTimeoutError as ServerTimeoutError
+from .client_exceptions import TooManyRedirects as TooManyRedirects
+from .client_exceptions import WSServerHandshakeError as WSServerHandshakeError
+from .client_reqrep import SSL_ALLOWED_TYPES as SSL_ALLOWED_TYPES
+from .client_reqrep import ClientRequest as ClientRequest
+from .client_reqrep import ClientResponse as ClientResponse
+from .client_reqrep import Fingerprint as Fingerprint
+from .client_reqrep import RequestInfo as RequestInfo
+from .client_ws import ClientWebSocketResponse as ClientWebSocketResponse
+from .connector import BaseConnector as BaseConnector
+from .connector import NamedPipeConnector as NamedPipeConnector
+from .connector import TCPConnector as TCPConnector
+from .connector import UnixConnector as UnixConnector
 from .cookiejar import CookieJar
 from .helpers import (
     PY_36,

aiohttp/http.py

@@ -3,34 +3,28 @@
 from typing import Mapping, Tuple  # noqa
 
 from . import __version__
-from .http_exceptions import HttpProcessingError
-from .http_parser import (
-    HeadersParser,
-    HttpParser,
-    HttpRequestParser,
-    HttpResponseParser,
-    RawRequestMessage,
-    RawResponseMessage,
-)
-from .http_websocket import (
-    WS_CLOSED_MESSAGE,
-    WS_CLOSING_MESSAGE,
-    WS_KEY,
-    WebSocketError,
-    WebSocketReader,
-    WebSocketWriter,
-    WSCloseCode,
-    WSMessage,
-    WSMsgType,
-    ws_ext_gen,
-    ws_ext_parse,
-)
-from .http_writer import (
-    HttpVersion,
-    HttpVersion10,
-    HttpVersion11,
-    StreamWriter,
-)
+from .http_exceptions import HttpProcessingError as HttpProcessingError
+from .http_parser import HeadersParser as HeadersParser
+from .http_parser import HttpParser as HttpParser
+from .http_parser import HttpRequestParser as HttpRequestParser
+from .http_parser import HttpResponseParser as HttpResponseParser
+from .http_parser import RawRequestMessage as RawRequestMessage
+from .http_parser import RawResponseMessage as RawResponseMessage
+from .http_websocket import WS_CLOSED_MESSAGE as WS_CLOSED_MESSAGE
+from .http_websocket import WS_CLOSING_MESSAGE as WS_CLOSING_MESSAGE
+from .http_websocket import WS_KEY as WS_KEY
+from .http_websocket import WebSocketError as WebSocketError
+from .http_websocket import WebSocketReader as WebSocketReader
+from .http_websocket import WebSocketWriter as WebSocketWriter
+from .http_websocket import WSCloseCode as WSCloseCode
+from .http_websocket import WSMessage as WSMessage
+from .http_websocket import WSMsgType as WSMsgType
+from .http_websocket import ws_ext_gen as ws_ext_gen
+from .http_websocket import ws_ext_parse as ws_ext_parse
+from .http_writer import HttpVersion as HttpVersion
+from .http_writer import HttpVersion10 as HttpVersion10
+from .http_writer import HttpVersion11 as HttpVersion11
+from .http_writer import StreamWriter as StreamWriter
 
 __all__ = (
     'HttpProcessingError', 'RESPONSES', 'SERVER_SOFTWARE',