Skip to content

Commit 6ab76b0

Browse files
asvetlovasvetlov
committed
Apply black
1 parent 03b3400 commit 6ab76b0

File tree

131 files changed

+14440
-13602
lines changed

Some content is hidden

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

131 files changed

+14440
-13602
lines changed

‎aiohttp/__init__.py‎

Lines changed: 92 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = '4.0.0a1'
1+
__version__ = "4.0.0a1"
22

33
from typing import Tuple
44

@@ -115,110 +115,111 @@
115115
)
116116

117117
__all__: Tuple[str, ...] = (
118-
'hdrs',
118+
"hdrs",
119119
# client
120-
'BaseConnector',
121-
'ClientConnectionError',
122-
'ClientConnectorCertificateError',
123-
'ClientConnectorError',
124-
'ClientConnectorSSLError',
125-
'ClientError',
126-
'ClientHttpProxyError',
127-
'ClientOSError',
128-
'ClientPayloadError',
129-
'ClientProxyConnectionError',
130-
'ClientResponse',
131-
'ClientRequest',
132-
'ClientResponseError',
133-
'ClientSSLError',
134-
'ClientSession',
135-
'ClientTimeout',
136-
'ClientWebSocketResponse',
137-
'ContentTypeError',
138-
'Fingerprint',
139-
'InvalidURL',
140-
'RequestInfo',
141-
'ServerConnectionError',
142-
'ServerDisconnectedError',
143-
'ServerFingerprintMismatch',
144-
'ServerTimeoutError',
145-
'TCPConnector',
146-
'TooManyRedirects',
147-
'UnixConnector',
148-
'NamedPipeConnector',
149-
'WSServerHandshakeError',
150-
'request',
120+
"BaseConnector",
121+
"ClientConnectionError",
122+
"ClientConnectorCertificateError",
123+
"ClientConnectorError",
124+
"ClientConnectorSSLError",
125+
"ClientError",
126+
"ClientHttpProxyError",
127+
"ClientOSError",
128+
"ClientPayloadError",
129+
"ClientProxyConnectionError",
130+
"ClientResponse",
131+
"ClientRequest",
132+
"ClientResponseError",
133+
"ClientSSLError",
134+
"ClientSession",
135+
"ClientTimeout",
136+
"ClientWebSocketResponse",
137+
"ContentTypeError",
138+
"Fingerprint",
139+
"InvalidURL",
140+
"RequestInfo",
141+
"ServerConnectionError",
142+
"ServerDisconnectedError",
143+
"ServerFingerprintMismatch",
144+
"ServerTimeoutError",
145+
"TCPConnector",
146+
"TooManyRedirects",
147+
"UnixConnector",
148+
"NamedPipeConnector",
149+
"WSServerHandshakeError",
150+
"request",
151151
# cookiejar
152-
'CookieJar',
153-
'DummyCookieJar',
152+
"CookieJar",
153+
"DummyCookieJar",
154154
# formdata
155-
'FormData',
155+
"FormData",
156156
# helpers
157-
'BasicAuth',
158-
'ChainMapProxy',
157+
"BasicAuth",
158+
"ChainMapProxy",
159159
# http
160-
'HttpVersion',
161-
'HttpVersion10',
162-
'HttpVersion11',
163-
'WSMsgType',
164-
'WSCloseCode',
165-
'WSMessage',
166-
'WebSocketError',
160+
"HttpVersion",
161+
"HttpVersion10",
162+
"HttpVersion11",
163+
"WSMsgType",
164+
"WSCloseCode",
165+
"WSMessage",
166+
"WebSocketError",
167167
# multipart
168-
'BadContentDispositionHeader',
169-
'BadContentDispositionParam',
170-
'BodyPartReader',
171-
'MultipartReader',
172-
'MultipartWriter',
173-
'content_disposition_filename',
174-
'parse_content_disposition',
168+
"BadContentDispositionHeader",
169+
"BadContentDispositionParam",
170+
"BodyPartReader",
171+
"MultipartReader",
172+
"MultipartWriter",
173+
"content_disposition_filename",
174+
"parse_content_disposition",
175175
# payload
176-
'AsyncIterablePayload',
177-
'BufferedReaderPayload',
178-
'BytesIOPayload',
179-
'BytesPayload',
180-
'IOBasePayload',
181-
'JsonPayload',
182-
'PAYLOAD_REGISTRY',
183-
'Payload',
184-
'StringIOPayload',
185-
'StringPayload',
186-
'TextIOPayload',
187-
'get_payload',
188-
'payload_type',
176+
"AsyncIterablePayload",
177+
"BufferedReaderPayload",
178+
"BytesIOPayload",
179+
"BytesPayload",
180+
"IOBasePayload",
181+
"JsonPayload",
182+
"PAYLOAD_REGISTRY",
183+
"Payload",
184+
"StringIOPayload",
185+
"StringPayload",
186+
"TextIOPayload",
187+
"get_payload",
188+
"payload_type",
189189
# resolver
190-
'AsyncResolver',
191-
'DefaultResolver',
192-
'ThreadedResolver',
190+
"AsyncResolver",
191+
"DefaultResolver",
192+
"ThreadedResolver",
193193
# signals
194-
'Signal',
194+
"Signal",
195195
# streams
196-
'DataQueue',
197-
'EMPTY_PAYLOAD',
198-
'EofStream',
199-
'FlowControlDataQueue',
200-
'StreamReader',
196+
"DataQueue",
197+
"EMPTY_PAYLOAD",
198+
"EofStream",
199+
"FlowControlDataQueue",
200+
"StreamReader",
201201
# tracing
202-
'TraceConfig',
203-
'TraceConnectionCreateEndParams',
204-
'TraceConnectionCreateStartParams',
205-
'TraceConnectionQueuedEndParams',
206-
'TraceConnectionQueuedStartParams',
207-
'TraceConnectionReuseconnParams',
208-
'TraceDnsCacheHitParams',
209-
'TraceDnsCacheMissParams',
210-
'TraceDnsResolveHostEndParams',
211-
'TraceDnsResolveHostStartParams',
212-
'TraceRequestChunkSentParams',
213-
'TraceRequestEndParams',
214-
'TraceRequestExceptionParams',
215-
'TraceRequestRedirectParams',
216-
'TraceRequestStartParams',
217-
'TraceResponseChunkReceivedParams',
202+
"TraceConfig",
203+
"TraceConnectionCreateEndParams",
204+
"TraceConnectionCreateStartParams",
205+
"TraceConnectionQueuedEndParams",
206+
"TraceConnectionQueuedStartParams",
207+
"TraceConnectionReuseconnParams",
208+
"TraceDnsCacheHitParams",
209+
"TraceDnsCacheMissParams",
210+
"TraceDnsResolveHostEndParams",
211+
"TraceDnsResolveHostStartParams",
212+
"TraceRequestChunkSentParams",
213+
"TraceRequestEndParams",
214+
"TraceRequestExceptionParams",
215+
"TraceRequestRedirectParams",
216+
"TraceRequestStartParams",
217+
"TraceResponseChunkReceivedParams",
218218
)
219219

220220
try:
221221
from .worker import GunicornUVLoopWebWorker, GunicornWebWorker # noqa
222-
__all__ += ('GunicornWebWorker', 'GunicornUVLoopWebWorker')
222+
223+
__all__ += ("GunicornWebWorker", "GunicornUVLoopWebWorker")
223224
except ImportError: # pragma: no cover
224225
pass

‎aiohttp/_helpers.pyi‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@ from typing import Any
22

33
class reify:
44
def __init__(self, wrapped: Any) -> None: ...
5-
65
def __get__(self, inst: Any, owner: Any) -> Any: ...
7-
86
def __set__(self, inst: Any, value: Any) -> None: ...

‎aiohttp/abc.py‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232

3333
class AbstractRouter(ABC):
34-
3534
def __init__(self) -> None:
3635
self._frozen = False
3736

@@ -52,12 +51,11 @@ def freeze(self) -> None:
5251
self._frozen = True
5352

5453
@abstractmethod
55-
async def resolve(self, request: Request) -> 'AbstractMatchInfo':
54+
async def resolve(self, request: Request) -> "AbstractMatchInfo":
5655
"""Return MATCH_INFO for given request"""
5756

5857

5958
class AbstractMatchInfo(ABC):
60-
6159
@property # pragma: no branch
6260
@abstractmethod
6361
def handler(self) -> Callable[[Request], Awaitable[StreamResponse]]:
@@ -121,8 +119,7 @@ class AbstractResolver(ABC):
121119
"""Abstract DNS resolver."""
122120

123121
@abstractmethod
124-
async def resolve(self, host: str,
125-
port: int, family: int) -> List[Dict[str, Any]]:
122+
async def resolve(self, host: str, port: int, family: int) -> List[Dict[str, Any]]:
126123
"""Return IP address for given hostname"""
127124

128125
@abstractmethod
@@ -144,13 +141,11 @@ def clear(self) -> None:
144141
"""Clear all cookies."""
145142

146143
@abstractmethod
147-
def update_cookies(self,
148-
cookies: LooseCookies,
149-
response_url: URL=URL()) -> None:
144+
def update_cookies(self, cookies: LooseCookies, response_url: URL = URL()) -> None:
150145
"""Update cookies."""
151146

152147
@abstractmethod
153-
def filter_cookies(self, request_url: URL) -> 'BaseCookie[str]':
148+
def filter_cookies(self, request_url: URL) -> "BaseCookie[str]":
154149
"""Return the jar's cookies filtered by their attributes."""
155150

156151

@@ -166,24 +161,25 @@ async def write(self, chunk: bytes) -> None:
166161
"""Write chunk into stream."""
167162

168163
@abstractmethod
169-
async def write_eof(self, chunk: bytes=b'') -> None:
164+
async def write_eof(self, chunk: bytes = b"") -> None:
170165
"""Write last chunk."""
171166

172167
@abstractmethod
173168
async def drain(self) -> None:
174169
"""Flush the write buffer."""
175170

176171
@abstractmethod
177-
def enable_compression(self, encoding: str='deflate') -> None:
172+
def enable_compression(self, encoding: str = "deflate") -> None:
178173
"""Enable HTTP body compression"""
179174

180175
@abstractmethod
181176
def enable_chunking(self) -> None:
182177
"""Enable HTTP chunked mode"""
183178

184179
@abstractmethod
185-
async def write_headers(self, status_line: str,
186-
headers: 'CIMultiDict[str]') -> None:
180+
async def write_headers(
181+
self, status_line: str, headers: "CIMultiDict[str]"
182+
) -> None:
187183
"""Write HTTP headers"""
188184

189185

@@ -195,19 +191,15 @@ def __init__(self, logger: logging.Logger, log_format: str) -> None:
195191
self.log_format = log_format
196192

197193
@abstractmethod
198-
def log(self,
199-
request: BaseRequest,
200-
response: StreamResponse,
201-
time: float) -> None:
194+
def log(self, request: BaseRequest, response: StreamResponse, time: float) -> None:
202195
"""Emit log to logger."""
203196

204197

205198
class AbstractAsyncAccessLogger(ABC):
206199
"""Abstract asynchronous writer to access log."""
207200

208201
@abstractmethod
209-
async def log(self,
210-
request: BaseRequest,
211-
response: StreamResponse,
212-
request_start: float) -> None:
202+
async def log(
203+
self, request: BaseRequest, response: StreamResponse, request_start: float
204+
) -> None:
213205
"""Emit log to logger."""

‎aiohttp/base_protocol.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@
55

66

77
class BaseProtocol(asyncio.Protocol):
8-
__slots__ = ('_loop', '_paused', '_drain_waiter',
9-
'_connection_lost', '_reading_paused', 'transport')
8+
__slots__ = (
9+
"_loop",
10+
"_paused",
11+
"_drain_waiter",
12+
"_connection_lost",
13+
"_reading_paused",
14+
"transport",
15+
)
1016

1117
def __init__(self, loop: asyncio.AbstractEventLoop) -> None:
1218
self._loop = loop # type: asyncio.AbstractEventLoop
@@ -71,7 +77,7 @@ def connection_lost(self, exc: Optional[BaseException]) -> None:
7177

7278
async def _drain_helper(self) -> None:
7379
if self._connection_lost:
74-
raise ConnectionResetError('Connection lost')
80+
raise ConnectionResetError("Connection lost")
7581
if not self._paused:
7682
return
7783
waiter = self._drain_waiter

0 commit comments

Comments
 (0)