Skip to content

Commit 185eca1

Browse files
AMDmi3asvetlov
AMDmi3
authored and
asvetlov
committed
Use correct style for re-exported imports (for 3.5 branch) (#3873)
1 parent f6a790d commit 185eca1

File tree

7 files changed

+289
-260
lines changed

7 files changed

+289
-260
lines changed

‎CHANGES/3868.bugfix

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

‎CONTRIBUTORS.txt

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ Dimitar Dimitrov
7373
Dmitriy Safonov
7474
Dmitry Doroshev
7575
Dmitry Lukashin
76+
Dmitry Marakasov
7677
Dmitry Shamov
7778
Dmitry Trofimov
7879
Dmytro Bohomiakov

‎aiohttp/__init__.py

+103-89
Original file line numberDiff line numberDiff line change
@@ -2,103 +2,117 @@
22

33
from typing import Tuple # noqa
44

5-
from . import hdrs
5+
from . import hdrs as hdrs
6+
from .client import BaseConnector as BaseConnector
7+
from .client import ClientConnectionError as ClientConnectionError
68
from .client import (
7-
BaseConnector,
8-
ClientConnectionError,
9-
ClientConnectorCertificateError,
10-
ClientConnectorError,
11-
ClientConnectorSSLError,
12-
ClientError,
13-
ClientHttpProxyError,
14-
ClientOSError,
15-
ClientPayloadError,
16-
ClientProxyConnectionError,
17-
ClientRequest,
18-
ClientResponse,
19-
ClientResponseError,
20-
ClientSession,
21-
ClientSSLError,
22-
ClientTimeout,
23-
ClientWebSocketResponse,
24-
ContentTypeError,
25-
Fingerprint,
26-
InvalidURL,
27-
NamedPipeConnector,
28-
RequestInfo,
29-
ServerConnectionError,
30-
ServerDisconnectedError,
31-
ServerFingerprintMismatch,
32-
ServerTimeoutError,
33-
TCPConnector,
34-
TooManyRedirects,
35-
UnixConnector,
36-
WSServerHandshakeError,
37-
request,
9+
ClientConnectorCertificateError as ClientConnectorCertificateError,
3810
)
39-
from .cookiejar import CookieJar, DummyCookieJar
40-
from .formdata import FormData
41-
from .helpers import BasicAuth, ChainMapProxy
42-
from .http import (
43-
HttpVersion,
44-
HttpVersion10,
45-
HttpVersion11,
46-
WebSocketError,
47-
WSCloseCode,
48-
WSMessage,
49-
WSMsgType,
11+
from .client import ClientConnectorError as ClientConnectorError
12+
from .client import ClientConnectorSSLError as ClientConnectorSSLError
13+
from .client import ClientError as ClientError
14+
from .client import ClientHttpProxyError as ClientHttpProxyError
15+
from .client import ClientOSError as ClientOSError
16+
from .client import ClientPayloadError as ClientPayloadError
17+
from .client import ClientProxyConnectionError as ClientProxyConnectionError
18+
from .client import ClientRequest as ClientRequest
19+
from .client import ClientResponse as ClientResponse
20+
from .client import ClientResponseError as ClientResponseError
21+
from .client import ClientSession as ClientSession
22+
from .client import ClientSSLError as ClientSSLError
23+
from .client import ClientTimeout as ClientTimeout
24+
from .client import ClientWebSocketResponse as ClientWebSocketResponse
25+
from .client import ContentTypeError as ContentTypeError
26+
from .client import Fingerprint as Fingerprint
27+
from .client import InvalidURL as InvalidURL
28+
from .client import NamedPipeConnector as NamedPipeConnector
29+
from .client import RequestInfo as RequestInfo
30+
from .client import ServerConnectionError as ServerConnectionError
31+
from .client import ServerDisconnectedError as ServerDisconnectedError
32+
from .client import ServerFingerprintMismatch as ServerFingerprintMismatch
33+
from .client import ServerTimeoutError as ServerTimeoutError
34+
from .client import TCPConnector as TCPConnector
35+
from .client import TooManyRedirects as TooManyRedirects
36+
from .client import UnixConnector as UnixConnector
37+
from .client import WSServerHandshakeError as WSServerHandshakeError
38+
from .client import request as request
39+
from .cookiejar import CookieJar as CookieJar
40+
from .cookiejar import DummyCookieJar as DummyCookieJar
41+
from .formdata import FormData as FormData
42+
from .helpers import BasicAuth as BasicAuth
43+
from .helpers import ChainMapProxy as ChainMapProxy
44+
from .http import HttpVersion as HttpVersion
45+
from .http import HttpVersion10 as HttpVersion10
46+
from .http import HttpVersion11 as HttpVersion11
47+
from .http import WebSocketError as WebSocketError
48+
from .http import WSCloseCode as WSCloseCode
49+
from .http import WSMessage as WSMessage
50+
from .http import WSMsgType as WSMsgType
51+
from .multipart import (
52+
BadContentDispositionHeader as BadContentDispositionHeader,
5053
)
54+
from .multipart import BadContentDispositionParam as BadContentDispositionParam
55+
from .multipart import BodyPartReader as BodyPartReader
56+
from .multipart import MultipartReader as MultipartReader
57+
from .multipart import MultipartWriter as MultipartWriter
5158
from .multipart import (
52-
BadContentDispositionHeader,
53-
BadContentDispositionParam,
54-
BodyPartReader,
55-
MultipartReader,
56-
MultipartWriter,
57-
content_disposition_filename,
58-
parse_content_disposition,
59+
content_disposition_filename as content_disposition_filename,
60+
)
61+
from .multipart import parse_content_disposition as parse_content_disposition
62+
from .payload import PAYLOAD_REGISTRY as PAYLOAD_REGISTRY
63+
from .payload import AsyncIterablePayload as AsyncIterablePayload
64+
from .payload import BufferedReaderPayload as BufferedReaderPayload
65+
from .payload import BytesIOPayload as BytesIOPayload
66+
from .payload import BytesPayload as BytesPayload
67+
from .payload import IOBasePayload as IOBasePayload
68+
from .payload import JsonPayload as JsonPayload
69+
from .payload import Payload as Payload
70+
from .payload import StringIOPayload as StringIOPayload
71+
from .payload import StringPayload as StringPayload
72+
from .payload import TextIOPayload as TextIOPayload
73+
from .payload import get_payload as get_payload
74+
from .payload import payload_type as payload_type
75+
from .payload_streamer import streamer as streamer
76+
from .resolver import AsyncResolver as AsyncResolver
77+
from .resolver import DefaultResolver as DefaultResolver
78+
from .resolver import ThreadedResolver as ThreadedResolver
79+
from .signals import Signal as Signal
80+
from .streams import EMPTY_PAYLOAD as EMPTY_PAYLOAD
81+
from .streams import DataQueue as DataQueue
82+
from .streams import EofStream as EofStream
83+
from .streams import FlowControlDataQueue as FlowControlDataQueue
84+
from .streams import StreamReader as StreamReader
85+
from .tracing import TraceConfig as TraceConfig
86+
from .tracing import (
87+
TraceConnectionCreateEndParams as TraceConnectionCreateEndParams,
5988
)
60-
from .payload import (
61-
PAYLOAD_REGISTRY,
62-
AsyncIterablePayload,
63-
BufferedReaderPayload,
64-
BytesIOPayload,
65-
BytesPayload,
66-
IOBasePayload,
67-
JsonPayload,
68-
Payload,
69-
StringIOPayload,
70-
StringPayload,
71-
TextIOPayload,
72-
get_payload,
73-
payload_type,
89+
from .tracing import (
90+
TraceConnectionCreateStartParams as TraceConnectionCreateStartParams,
7491
)
75-
from .payload_streamer import streamer
76-
from .resolver import AsyncResolver, DefaultResolver, ThreadedResolver
77-
from .signals import Signal
78-
from .streams import (
79-
EMPTY_PAYLOAD,
80-
DataQueue,
81-
EofStream,
82-
FlowControlDataQueue,
83-
StreamReader,
92+
from .tracing import (
93+
TraceConnectionQueuedEndParams as TraceConnectionQueuedEndParams,
94+
)
95+
from .tracing import (
96+
TraceConnectionQueuedStartParams as TraceConnectionQueuedStartParams,
97+
)
98+
from .tracing import (
99+
TraceConnectionReuseconnParams as TraceConnectionReuseconnParams,
100+
)
101+
from .tracing import TraceDnsCacheHitParams as TraceDnsCacheHitParams
102+
from .tracing import TraceDnsCacheMissParams as TraceDnsCacheMissParams
103+
from .tracing import (
104+
TraceDnsResolveHostEndParams as TraceDnsResolveHostEndParams,
105+
)
106+
from .tracing import (
107+
TraceDnsResolveHostStartParams as TraceDnsResolveHostStartParams,
84108
)
109+
from .tracing import TraceRequestChunkSentParams as TraceRequestChunkSentParams
110+
from .tracing import TraceRequestEndParams as TraceRequestEndParams
111+
from .tracing import TraceRequestExceptionParams as TraceRequestExceptionParams
112+
from .tracing import TraceRequestRedirectParams as TraceRequestRedirectParams
113+
from .tracing import TraceRequestStartParams as TraceRequestStartParams
85114
from .tracing import (
86-
TraceConfig,
87-
TraceConnectionCreateEndParams,
88-
TraceConnectionCreateStartParams,
89-
TraceConnectionQueuedEndParams,
90-
TraceConnectionQueuedStartParams,
91-
TraceConnectionReuseconnParams,
92-
TraceDnsCacheHitParams,
93-
TraceDnsCacheMissParams,
94-
TraceDnsResolveHostEndParams,
95-
TraceDnsResolveHostStartParams,
96-
TraceRequestChunkSentParams,
97-
TraceRequestEndParams,
98-
TraceRequestExceptionParams,
99-
TraceRequestRedirectParams,
100-
TraceRequestStartParams,
101-
TraceResponseChunkReceivedParams,
115+
TraceResponseChunkReceivedParams as TraceResponseChunkReceivedParams,
102116
)
103117

104118
__all__ = (

‎aiohttp/client.py

+35-31
Original file line numberDiff line numberDiff line change
@@ -31,41 +31,45 @@
3131

3232
from . import hdrs, http, payload
3333
from .abc import AbstractCookieJar
34+
from .client_exceptions import ClientConnectionError as ClientConnectionError
3435
from .client_exceptions import (
35-
ClientConnectionError,
36-
ClientConnectorCertificateError,
37-
ClientConnectorError,
38-
ClientConnectorSSLError,
39-
ClientError,
40-
ClientHttpProxyError,
41-
ClientOSError,
42-
ClientPayloadError,
43-
ClientProxyConnectionError,
44-
ClientResponseError,
45-
ClientSSLError,
46-
ContentTypeError,
47-
InvalidURL,
48-
ServerConnectionError,
49-
ServerDisconnectedError,
50-
ServerFingerprintMismatch,
51-
ServerTimeoutError,
52-
TooManyRedirects,
53-
WSServerHandshakeError,
36+
ClientConnectorCertificateError as ClientConnectorCertificateError,
5437
)
55-
from .client_reqrep import (
56-
ClientRequest,
57-
ClientResponse,
58-
Fingerprint,
59-
RequestInfo,
60-
_merge_ssl_params,
38+
from .client_exceptions import ClientConnectorError as ClientConnectorError
39+
from .client_exceptions import (
40+
ClientConnectorSSLError as ClientConnectorSSLError,
41+
)
42+
from .client_exceptions import ClientError as ClientError
43+
from .client_exceptions import ClientHttpProxyError as ClientHttpProxyError
44+
from .client_exceptions import ClientOSError as ClientOSError
45+
from .client_exceptions import ClientPayloadError as ClientPayloadError
46+
from .client_exceptions import (
47+
ClientProxyConnectionError as ClientProxyConnectionError,
6148
)
62-
from .client_ws import ClientWebSocketResponse
63-
from .connector import (
64-
BaseConnector,
65-
NamedPipeConnector,
66-
TCPConnector,
67-
UnixConnector,
49+
from .client_exceptions import ClientResponseError as ClientResponseError
50+
from .client_exceptions import ClientSSLError as ClientSSLError
51+
from .client_exceptions import ContentTypeError as ContentTypeError
52+
from .client_exceptions import InvalidURL as InvalidURL
53+
from .client_exceptions import ServerConnectionError as ServerConnectionError
54+
from .client_exceptions import (
55+
ServerDisconnectedError as ServerDisconnectedError,
56+
)
57+
from .client_exceptions import (
58+
ServerFingerprintMismatch as ServerFingerprintMismatch,
6859
)
60+
from .client_exceptions import ServerTimeoutError as ServerTimeoutError
61+
from .client_exceptions import TooManyRedirects as TooManyRedirects
62+
from .client_exceptions import WSServerHandshakeError as WSServerHandshakeError
63+
from .client_reqrep import ClientRequest as ClientRequest
64+
from .client_reqrep import ClientResponse as ClientResponse
65+
from .client_reqrep import Fingerprint as Fingerprint
66+
from .client_reqrep import RequestInfo as RequestInfo
67+
from .client_reqrep import _merge_ssl_params
68+
from .client_ws import ClientWebSocketResponse as ClientWebSocketResponse
69+
from .connector import BaseConnector as BaseConnector
70+
from .connector import NamedPipeConnector as NamedPipeConnector
71+
from .connector import TCPConnector as TCPConnector
72+
from .connector import UnixConnector as UnixConnector
6973
from .cookiejar import CookieJar
7074
from .helpers import (
7175
DEBUG,

‎aiohttp/http.py

+22-28
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,28 @@
33
from typing import Mapping, Tuple # noqa
44

55
from . import __version__
6-
from .http_exceptions import HttpProcessingError
7-
from .http_parser import (
8-
HeadersParser,
9-
HttpParser,
10-
HttpRequestParser,
11-
HttpResponseParser,
12-
RawRequestMessage,
13-
RawResponseMessage,
14-
)
15-
from .http_websocket import (
16-
WS_CLOSED_MESSAGE,
17-
WS_CLOSING_MESSAGE,
18-
WS_KEY,
19-
WebSocketError,
20-
WebSocketReader,
21-
WebSocketWriter,
22-
WSCloseCode,
23-
WSMessage,
24-
WSMsgType,
25-
ws_ext_gen,
26-
ws_ext_parse,
27-
)
28-
from .http_writer import (
29-
HttpVersion,
30-
HttpVersion10,
31-
HttpVersion11,
32-
StreamWriter,
33-
)
6+
from .http_exceptions import HttpProcessingError as HttpProcessingError
7+
from .http_parser import HeadersParser as HeadersParser
8+
from .http_parser import HttpParser as HttpParser
9+
from .http_parser import HttpRequestParser as HttpRequestParser
10+
from .http_parser import HttpResponseParser as HttpResponseParser
11+
from .http_parser import RawRequestMessage as RawRequestMessage
12+
from .http_parser import RawResponseMessage as RawResponseMessage
13+
from .http_websocket import WS_CLOSED_MESSAGE as WS_CLOSED_MESSAGE
14+
from .http_websocket import WS_CLOSING_MESSAGE as WS_CLOSING_MESSAGE
15+
from .http_websocket import WS_KEY as WS_KEY
16+
from .http_websocket import WebSocketError as WebSocketError
17+
from .http_websocket import WebSocketReader as WebSocketReader
18+
from .http_websocket import WebSocketWriter as WebSocketWriter
19+
from .http_websocket import WSCloseCode as WSCloseCode
20+
from .http_websocket import WSMessage as WSMessage
21+
from .http_websocket import WSMsgType as WSMsgType
22+
from .http_websocket import ws_ext_gen as ws_ext_gen
23+
from .http_websocket import ws_ext_parse as ws_ext_parse
24+
from .http_writer import HttpVersion as HttpVersion
25+
from .http_writer import HttpVersion10 as HttpVersion10
26+
from .http_writer import HttpVersion11 as HttpVersion11
27+
from .http_writer import StreamWriter as StreamWriter
3428

3529
__all__ = (
3630
'HttpProcessingError', 'RESPONSES', 'SERVER_SOFTWARE',

0 commit comments

Comments
 (0)