Skip to content

Commit 164597b

Browse files
committed
fix by linters
1 parent 71ec0db commit 164597b

File tree

3 files changed

+55
-22
lines changed

3 files changed

+55
-22
lines changed

ydb/_errors.py

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,37 @@
2121
def check_retriable_error(err, retry_settings, attempt):
2222
if isinstance(err, issues.NotFound):
2323
if retry_settings.retry_not_found:
24-
return ErrorRetryInfo(True, retry_settings.fast_backoff.calc_timeout(attempt))
24+
return ErrorRetryInfo(
25+
True, retry_settings.fast_backoff.calc_timeout(attempt)
26+
)
2527
else:
2628
return ErrorRetryInfo(False, None)
2729

2830
if isinstance(err, issues.InternalError):
2931
if retry_settings.retry_internal_error:
30-
return ErrorRetryInfo(True, retry_settings.slow_backoff.calc_timeout(attempt))
32+
return ErrorRetryInfo(
33+
True, retry_settings.slow_backoff.calc_timeout(attempt)
34+
)
3135
else:
3236
return ErrorRetryInfo(False, None)
3337

3438
for t in _errors_retriable_fast_backoff_types:
3539
if isinstance(err, t):
36-
return ErrorRetryInfo(True, retry_settings.fast_backoff.calc_timeout(attempt))
40+
return ErrorRetryInfo(
41+
True, retry_settings.fast_backoff.calc_timeout(attempt)
42+
)
3743

3844
for t in _errors_retriable_slow_backoff_types:
3945
if isinstance(err, t):
40-
return ErrorRetryInfo(True, retry_settings.slow_backoff.calc_timeout(attempt))
46+
return ErrorRetryInfo(
47+
True, retry_settings.slow_backoff.calc_timeout(attempt)
48+
)
4149

4250
if retry_settings.idempotent:
4351
for t in _errors_retriable_slow_backoff_idempotent_types:
44-
return ErrorRetryInfo(True, retry_settings.slow_backoff.calc_timeout(attempt))
52+
return ErrorRetryInfo(
53+
True, retry_settings.slow_backoff.calc_timeout(attempt)
54+
)
4555

4656
return ErrorRetryInfo(False, None)
4757

ydb/table.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,11 @@ def __init__(self, result):
930930
self.exc = None
931931

932932
def __eq__(self, other):
933-
return type(self) == type(other) and self.result == other.result and self.exc == other.exc
933+
return (
934+
type(self) == type(other)
935+
and self.result == other.result
936+
and self.exc == other.exc
937+
)
934938

935939
def __repr__(self):
936940
return "YdbRetryOperationFinalResult(%s, exc=%s)" % (self.result, self.exc)

ydb/table_test.py

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
1-
import random
21
from unittest import mock
3-
from ydb import retry_operation_impl, YdbRetryOperationFinalResult, issues, YdbRetryOperationSleepOpt, RetrySettings
2+
from ydb import (
3+
retry_operation_impl,
4+
YdbRetryOperationFinalResult,
5+
issues,
6+
YdbRetryOperationSleepOpt,
7+
RetrySettings,
8+
)
49

510

611
def test_retry_operation_impl(monkeypatch):
712
monkeypatch.setattr("random.random", lambda: 0.5)
8-
monkeypatch.setattr(issues.Error, "__eq__",
9-
lambda self, other: type(self) == type(other) and self.message == other.message
10-
)
13+
monkeypatch.setattr(
14+
issues.Error,
15+
"__eq__",
16+
lambda self, other: type(self) == type(other) and self.message == other.message,
17+
)
1118

1219
retry_once_settings = RetrySettings(
1320
max_retries=1,
@@ -41,7 +48,9 @@ def check_unretriable_error(err_type, call_ydb_handler):
4148
retry_once_settings.on_ydb_error_callback.reset_mock()
4249
retry_once_settings.unknown_error_handler.reset_mock()
4350

44-
results = get_results(mock.Mock(side_effect=[err_type("test1"), err_type("test2")]))
51+
results = get_results(
52+
mock.Mock(side_effect=[err_type("test1"), err_type("test2")])
53+
)
4554
yields = results[0]
4655
exc = results[1]
4756

@@ -50,25 +59,33 @@ def check_unretriable_error(err_type, call_ydb_handler):
5059

5160
if call_ydb_handler:
5261
assert retry_once_settings.on_ydb_error_callback.call_count == 1
53-
retry_once_settings.on_ydb_error_callback.assert_called_with(err_type("test1"))
62+
retry_once_settings.on_ydb_error_callback.assert_called_with(
63+
err_type("test1")
64+
)
5465

5566
assert retry_once_settings.unknown_error_handler.call_count == 0
5667
else:
5768
assert retry_once_settings.on_ydb_error_callback.call_count == 0
5869

5970
assert retry_once_settings.unknown_error_handler.call_count == 1
60-
retry_once_settings.unknown_error_handler.assert_called_with(err_type("test1"))
61-
71+
retry_once_settings.unknown_error_handler.assert_called_with(
72+
err_type("test1")
73+
)
6274

6375
def check_retriable_error(err_type, backoff):
6476
retry_once_settings.on_ydb_error_callback.reset_mock()
6577

66-
results = get_results(mock.Mock(side_effect=[err_type("test1"), err_type("test2")]))
78+
results = get_results(
79+
mock.Mock(side_effect=[err_type("test1"), err_type("test2")])
80+
)
6781
yields = results[0]
6882
exc = results[1]
6983

7084
if backoff:
71-
assert [YdbRetryOperationSleepOpt(backoff.calc_timeout(0)), YdbRetryOperationSleepOpt(backoff.calc_timeout(1))] == yields
85+
assert [
86+
YdbRetryOperationSleepOpt(backoff.calc_timeout(0)),
87+
YdbRetryOperationSleepOpt(backoff.calc_timeout(1)),
88+
] == yields
7289
else:
7390
assert [] == yields
7491

@@ -84,10 +101,13 @@ def check_retriable_error(err_type, backoff):
84101
assert get_results(lambda: True) == ([YdbRetryOperationFinalResult(True)], None)
85102

86103
# check retry error and return result
87-
assert get_results(mock.Mock(side_effect=[issues.Overloaded("test"), True])) == ([
88-
YdbRetryOperationSleepOpt(retry_once_settings.slow_backoff.calc_timeout(0)),
89-
YdbRetryOperationFinalResult(True),
90-
], None)
104+
assert get_results(mock.Mock(side_effect=[issues.Overloaded("test"), True])) == (
105+
[
106+
YdbRetryOperationSleepOpt(retry_once_settings.slow_backoff.calc_timeout(0)),
107+
YdbRetryOperationFinalResult(True),
108+
],
109+
None,
110+
)
91111

92112
# check errors
93113
check_retriable_error(issues.Aborted, None)
@@ -113,4 +133,3 @@ def check_retriable_error(err_type, backoff):
113133

114134
check_unretriable_error(issues.Error, True)
115135
check_unretriable_error(TestException, False)
116-

0 commit comments

Comments
 (0)