Skip to content

Commit 71fc90f

Browse files
vladvildanovvladvildanov
committed
Codestyle changes
1 parent 6b0c4ad commit 71fc90f

Some content is hidden

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

55 files changed

+3071
-1846
lines changed

‎redis/asyncio/client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,7 @@ async def run(
12391239
*,
12401240
exception_handler: Optional["PSWorkerThreadExcHandlerT"] = None,
12411241
poll_timeout: float = 1.0,
1242-
pubsub = None
1242+
pubsub=None,
12431243
) -> None:
12441244
"""Process pub/sub messages using registered callbacks.
12451245

‎redis/asyncio/cluster.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2255,7 +2255,9 @@ async def _reinitialize_on_error(self, error):
22552255
self.reinitialize_counter = 0
22562256
else:
22572257
if type(error) == MovedError:
2258-
self._pipe.cluster_client.nodes_manager.update_moved_exception(error)
2258+
self._pipe.cluster_client.nodes_manager.update_moved_exception(
2259+
error
2260+
)
22592261

22602262
self._executing = False
22612263

‎redis/asyncio/connection.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,7 @@ async def update_active_connections_for_reconnect(self):
12831283
"""
12841284
async with self._lock:
12851285
for conn in self._in_use_connections:
1286-
conn.mark_for_reconnect()
1286+
conn.mark_for_reconnect()
12871287

12881288
async def aclose(self) -> None:
12891289
"""Close the pool, disconnecting all connections"""

‎redis/asyncio/http/http_client.py‎

Lines changed: 83 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,18 @@
88
DEFAULT_TIMEOUT = 30.0
99
RETRY_STATUS_CODES = {429, 500, 502, 503, 504}
1010

11+
1112
class AsyncHTTPClient(ABC):
1213
@abstractmethod
1314
async def get(
1415
self,
1516
path: str,
16-
params: Optional[Mapping[str, Union[None, str, int, float, bool, list, tuple]]] = None,
17+
params: Optional[
18+
Mapping[str, Union[None, str, int, float, bool, list, tuple]]
19+
] = None,
1720
headers: Optional[Mapping[str, str]] = None,
1821
timeout: Optional[float] = None,
19-
expect_json: bool = True
22+
expect_json: bool = True,
2023
) -> Union[HttpResponse, Any]:
2124
"""
2225
Invoke HTTP GET request."""
@@ -26,10 +29,12 @@ async def get(
2629
async def delete(
2730
self,
2831
path: str,
29-
params: Optional[Mapping[str, Union[None, str, int, float, bool, list, tuple]]] = None,
32+
params: Optional[
33+
Mapping[str, Union[None, str, int, float, bool, list, tuple]]
34+
] = None,
3035
headers: Optional[Mapping[str, str]] = None,
3136
timeout: Optional[float] = None,
32-
expect_json: bool = True
37+
expect_json: bool = True,
3338
) -> Union[HttpResponse, Any]:
3439
"""
3540
Invoke HTTP DELETE request."""
@@ -41,10 +46,12 @@ async def post(
4146
path: str,
4247
json_body: Optional[Any] = None,
4348
data: Optional[Union[bytes, str]] = None,
44-
params: Optional[Mapping[str, Union[None, str, int, float, bool, list, tuple]]] = None,
49+
params: Optional[
50+
Mapping[str, Union[None, str, int, float, bool, list, tuple]]
51+
] = None,
4552
headers: Optional[Mapping[str, str]] = None,
4653
timeout: Optional[float] = None,
47-
expect_json: bool = True
54+
expect_json: bool = True,
4855
) -> Union[HttpResponse, Any]:
4956
"""
5057
Invoke HTTP POST request."""
@@ -56,10 +63,12 @@ async def put(
5663
path: str,
5764
json_body: Optional[Any] = None,
5865
data: Optional[Union[bytes, str]] = None,
59-
params: Optional[Mapping[str, Union[None, str, int, float, bool, list, tuple]]] = None,
66+
params: Optional[
67+
Mapping[str, Union[None, str, int, float, bool, list, tuple]]
68+
] = None,
6069
headers: Optional[Mapping[str, str]] = None,
6170
timeout: Optional[float] = None,
62-
expect_json: bool = True
71+
expect_json: bool = True,
6372
) -> Union[HttpResponse, Any]:
6473
"""
6574
Invoke HTTP PUT request."""
@@ -71,10 +80,12 @@ async def patch(
7180
path: str,
7281
json_body: Optional[Any] = None,
7382
data: Optional[Union[bytes, str]] = None,
74-
params: Optional[Mapping[str, Union[None, str, int, float, bool, list, tuple]]] = None,
83+
params: Optional[
84+
Mapping[str, Union[None, str, int, float, bool, list, tuple]]
85+
] = None,
7586
headers: Optional[Mapping[str, str]] = None,
7687
timeout: Optional[float] = None,
77-
expect_json: bool = True
88+
expect_json: bool = True,
7889
) -> Union[HttpResponse, Any]:
7990
"""
8091
Invoke HTTP PATCH request."""
@@ -85,7 +96,9 @@ async def request(
8596
self,
8697
method: str,
8798
path: str,
88-
params: Optional[Mapping[str, Union[None, str, int, float, bool, list, tuple]]] = None,
99+
params: Optional[
100+
Mapping[str, Union[None, str, int, float, bool, list, tuple]]
101+
] = None,
89102
headers: Optional[Mapping[str, str]] = None,
90103
body: Optional[Union[bytes, str]] = None,
91104
timeout: Optional[float] = None,
@@ -94,15 +107,13 @@ async def request(
94107
Invoke HTTP request with given method."""
95108
pass
96109

110+
97111
class AsyncHTTPClientWrapper(AsyncHTTPClient):
98112
"""
99113
An async wrapper around sync HTTP client with thread pool execution.
100114
"""
101-
def __init__(
102-
self,
103-
client: HttpClient,
104-
max_workers: int = 10
105-
) -> None:
115+
116+
def __init__(self, client: HttpClient, max_workers: int = 10) -> None:
106117
"""
107118
Initialize a new HTTP client instance.
108119
@@ -121,89 +132,121 @@ def __init__(
121132
async def get(
122133
self,
123134
path: str,
124-
params: Optional[Mapping[str, Union[None, str, int, float, bool, list, tuple]]] = None,
135+
params: Optional[
136+
Mapping[str, Union[None, str, int, float, bool, list, tuple]]
137+
] = None,
125138
headers: Optional[Mapping[str, str]] = None,
126139
timeout: Optional[float] = None,
127-
expect_json: bool = True
140+
expect_json: bool = True,
128141
) -> Union[HttpResponse, Any]:
129142
loop = asyncio.get_event_loop()
130143
return await loop.run_in_executor(
131-
self._executor,
132-
self.client.get,
133-
path, params, headers, timeout, expect_json
144+
self._executor, self.client.get, path, params, headers, timeout, expect_json
134145
)
135146

136147
async def delete(
137148
self,
138149
path: str,
139-
params: Optional[Mapping[str, Union[None, str, int, float, bool, list, tuple]]] = None,
150+
params: Optional[
151+
Mapping[str, Union[None, str, int, float, bool, list, tuple]]
152+
] = None,
140153
headers: Optional[Mapping[str, str]] = None,
141154
timeout: Optional[float] = None,
142-
expect_json: bool = True
155+
expect_json: bool = True,
143156
) -> Union[HttpResponse, Any]:
144157
loop = asyncio.get_event_loop()
145158
return await loop.run_in_executor(
146159
self._executor,
147160
self.client.delete,
148-
path, params, headers, timeout, expect_json
161+
path,
162+
params,
163+
headers,
164+
timeout,
165+
expect_json,
149166
)
150167

151168
async def post(
152169
self,
153170
path: str,
154171
json_body: Optional[Any] = None,
155172
data: Optional[Union[bytes, str]] = None,
156-
params: Optional[Mapping[str, Union[None, str, int, float, bool, list, tuple]]] = None,
173+
params: Optional[
174+
Mapping[str, Union[None, str, int, float, bool, list, tuple]]
175+
] = None,
157176
headers: Optional[Mapping[str, str]] = None,
158177
timeout: Optional[float] = None,
159-
expect_json: bool = True
178+
expect_json: bool = True,
160179
) -> Union[HttpResponse, Any]:
161180
loop = asyncio.get_event_loop()
162181
return await loop.run_in_executor(
163182
self._executor,
164183
self.client.post,
165-
path, json_body, data, params, headers, timeout, expect_json
184+
path,
185+
json_body,
186+
data,
187+
params,
188+
headers,
189+
timeout,
190+
expect_json,
166191
)
167192

168193
async def put(
169194
self,
170195
path: str,
171196
json_body: Optional[Any] = None,
172197
data: Optional[Union[bytes, str]] = None,
173-
params: Optional[Mapping[str, Union[None, str, int, float, bool, list, tuple]]] = None,
198+
params: Optional[
199+
Mapping[str, Union[None, str, int, float, bool, list, tuple]]
200+
] = None,
174201
headers: Optional[Mapping[str, str]] = None,
175202
timeout: Optional[float] = None,
176-
expect_json: bool = True
203+
expect_json: bool = True,
177204
) -> Union[HttpResponse, Any]:
178205
loop = asyncio.get_event_loop()
179206
return await loop.run_in_executor(
180207
self._executor,
181208
self.client.put,
182-
path, json_body, data, params, headers, timeout, expect_json
209+
path,
210+
json_body,
211+
data,
212+
params,
213+
headers,
214+
timeout,
215+
expect_json,
183216
)
184217

185218
async def patch(
186219
self,
187220
path: str,
188221
json_body: Optional[Any] = None,
189222
data: Optional[Union[bytes, str]] = None,
190-
params: Optional[Mapping[str, Union[None, str, int, float, bool, list, tuple]]] = None,
223+
params: Optional[
224+
Mapping[str, Union[None, str, int, float, bool, list, tuple]]
225+
] = None,
191226
headers: Optional[Mapping[str, str]] = None,
192227
timeout: Optional[float] = None,
193-
expect_json: bool = True
228+
expect_json: bool = True,
194229
) -> Union[HttpResponse, Any]:
195230
loop = asyncio.get_event_loop()
196231
return await loop.run_in_executor(
197232
self._executor,
198233
self.client.patch,
199-
path, json_body, data, params, headers, timeout, expect_json
234+
path,
235+
json_body,
236+
data,
237+
params,
238+
headers,
239+
timeout,
240+
expect_json,
200241
)
201242

202243
async def request(
203244
self,
204245
method: str,
205246
path: str,
206-
params: Optional[Mapping[str, Union[None, str, int, float, bool, list, tuple]]] = None,
247+
params: Optional[
248+
Mapping[str, Union[None, str, int, float, bool, list, tuple]]
249+
] = None,
207250
headers: Optional[Mapping[str, str]] = None,
208251
body: Optional[Union[bytes, str]] = None,
209252
timeout: Optional[float] = None,
@@ -212,5 +255,10 @@ async def request(
212255
return await loop.run_in_executor(
213256
self._executor,
214257
self.client.request,
215-
method, path, params, headers, body, timeout
258+
method,
259+
path,
260+
params,
261+
headers,
262+
body,
263+
timeout,
216264
)

0 commit comments

Comments
 (0)