Skip to content

Commit 57d328b

Browse files
committed
Codestyle changes
1 parent 71fc90f commit 57d328b

32 files changed

+105
-116
lines changed

redis/asyncio/cluster.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2254,7 +2254,7 @@ async def _reinitialize_on_error(self, error):
22542254
await self._pipe.cluster_client.nodes_manager.initialize()
22552255
self.reinitialize_counter = 0
22562256
else:
2257-
if type(error) == MovedError:
2257+
if type(error) is MovedError:
22582258
self._pipe.cluster_client.nodes_manager.update_moved_exception(
22592259
error
22602260
)

redis/asyncio/http/http_client.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import asyncio
22
from abc import ABC, abstractmethod
33
from concurrent.futures import ThreadPoolExecutor
4-
from typing import Optional, Mapping, Union, Any
5-
from redis.http.http_client import HttpResponse, HttpClient
4+
from typing import Any, Mapping, Optional, Union
5+
6+
from redis.http.http_client import HttpClient, HttpResponse
67

78
DEFAULT_USER_AGENT = "HttpClient/1.0 (+https://example.invalid)"
89
DEFAULT_TIMEOUT = 30.0

redis/asyncio/multidb/client.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
import asyncio
22
import logging
3-
from typing import Callable, Optional, Coroutine, Any, List, Union, Awaitable
3+
from typing import Any, Awaitable, Callable, Coroutine, List, Optional, Union
44

5-
from redis.asyncio.client import PubSubHandler
5+
from redis.asyncio.client import PSWorkerThreadExcHandlerT, PubSubHandler
66
from redis.asyncio.multidb.command_executor import DefaultCommandExecutor
7+
from redis.asyncio.multidb.config import DEFAULT_GRACE_PERIOD, MultiDbConfig
78
from redis.asyncio.multidb.database import AsyncDatabase, Databases
89
from redis.asyncio.multidb.failure_detector import AsyncFailureDetector
910
from redis.asyncio.multidb.healthcheck import HealthCheck, HealthCheckPolicy
10-
from redis.multidb.circuit import State as CBState, CircuitBreaker
11-
from redis.asyncio.multidb.config import MultiDbConfig, DEFAULT_GRACE_PERIOD
1211
from redis.background import BackgroundScheduler
13-
from redis.commands import AsyncRedisModuleCommands, AsyncCoreCommands
12+
from redis.commands import AsyncCoreCommands, AsyncRedisModuleCommands
13+
from redis.multidb.circuit import CircuitBreaker
14+
from redis.multidb.circuit import State as CBState
1415
from redis.multidb.exception import NoValidDatabaseException, UnhealthyDatabaseException
15-
from redis.typing import KeyT, EncodableT, ChannelT
16+
from redis.typing import ChannelT, EncodableT, KeyT
1617

1718
logger = logging.getLogger(__name__)
1819

redis/asyncio/multidb/command_executor.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
from abc import abstractmethod
22
from asyncio import iscoroutinefunction
33
from datetime import datetime
4-
from typing import List, Optional, Callable, Any, Union, Awaitable
4+
from typing import Any, Awaitable, Callable, List, Optional, Union
55

66
from redis.asyncio import RedisCluster
7-
from redis.asyncio.client import PubSub, Pipeline
8-
from redis.asyncio.multidb.database import Databases, AsyncDatabase, Database
7+
from redis.asyncio.client import Pipeline, PubSub
8+
from redis.asyncio.multidb.database import AsyncDatabase, Database, Databases
99
from redis.asyncio.multidb.event import (
1010
AsyncActiveDatabaseChanged,
11+
CloseConnectionOnActiveDatabaseChanged,
1112
RegisterCommandFailure,
1213
ResubscribeOnActiveDatabaseChanged,
13-
CloseConnectionOnActiveDatabaseChanged,
1414
)
1515
from redis.asyncio.multidb.failover import (
16-
AsyncFailoverStrategy,
17-
FailoverStrategyExecutor,
18-
DefaultFailoverStrategyExecutor,
1916
DEFAULT_FAILOVER_ATTEMPTS,
2017
DEFAULT_FAILOVER_DELAY,
18+
AsyncFailoverStrategy,
19+
DefaultFailoverStrategyExecutor,
20+
FailoverStrategyExecutor,
2121
)
2222
from redis.asyncio.multidb.failure_detector import AsyncFailureDetector
23-
from redis.multidb.circuit import State as CBState
2423
from redis.asyncio.retry import Retry
25-
from redis.event import EventDispatcherInterface, AsyncOnCommandsFailEvent
26-
from redis.multidb.command_executor import CommandExecutor, BaseCommandExecutor
24+
from redis.event import AsyncOnCommandsFailEvent, EventDispatcherInterface
25+
from redis.multidb.circuit import State as CBState
26+
from redis.multidb.command_executor import BaseCommandExecutor, CommandExecutor
2727
from redis.multidb.config import DEFAULT_AUTO_FALLBACK_INTERVAL
2828
from redis.typing import KeyT
2929

redis/asyncio/multidb/config.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
from dataclasses import dataclass, field
2-
from typing import Optional, List, Type, Union
2+
from typing import List, Optional, Type, Union
33

44
import pybreaker
55

66
from redis.asyncio import ConnectionPool, Redis, RedisCluster
7-
from redis.asyncio.multidb.database import Databases, Database
7+
from redis.asyncio.multidb.database import Database, Databases
88
from redis.asyncio.multidb.failover import (
9+
DEFAULT_FAILOVER_ATTEMPTS,
10+
DEFAULT_FAILOVER_DELAY,
911
AsyncFailoverStrategy,
1012
WeightBasedFailoverStrategy,
11-
DEFAULT_FAILOVER_DELAY,
12-
DEFAULT_FAILOVER_ATTEMPTS,
1313
)
1414
from redis.asyncio.multidb.failure_detector import (
1515
AsyncFailureDetector,
1616
FailureDetectorAsyncWrapper,
1717
)
1818
from redis.asyncio.multidb.healthcheck import (
19-
HealthCheck,
20-
EchoHealthCheck,
19+
DEFAULT_HEALTH_CHECK_DELAY,
2120
DEFAULT_HEALTH_CHECK_INTERVAL,
21+
DEFAULT_HEALTH_CHECK_POLICY,
2222
DEFAULT_HEALTH_CHECK_PROBES,
23-
DEFAULT_HEALTH_CHECK_DELAY,
23+
EchoHealthCheck,
24+
HealthCheck,
2425
HealthCheckPolicies,
25-
DEFAULT_HEALTH_CHECK_POLICY,
2626
)
2727
from redis.asyncio.retry import Retry
2828
from redis.backoff import ExponentialWithJitterBackoff, NoBackoff
2929
from redis.data_structure import WeightedList
30-
from redis.event import EventDispatcherInterface, EventDispatcher
30+
from redis.event import EventDispatcher, EventDispatcherInterface
3131
from redis.multidb.circuit import (
32+
DEFAULT_GRACE_PERIOD,
3233
CircuitBreaker,
3334
PBCircuitBreakerAdapter,
34-
DEFAULT_GRACE_PERIOD,
3535
)
3636
from redis.multidb.failure_detector import (
37-
CommandFailureDetector,
38-
DEFAULT_MIN_NUM_FAILURES,
3937
DEFAULT_FAILURE_RATE_THRESHOLD,
4038
DEFAULT_FAILURES_DETECTION_WINDOW,
39+
DEFAULT_MIN_NUM_FAILURES,
40+
CommandFailureDetector,
4141
)
4242

4343
DEFAULT_AUTO_FALLBACK_INTERVAL = 120

redis/asyncio/multidb/database.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from abc import abstractmethod
2-
from typing import Union, Optional
2+
from typing import Optional, Union
33

44
from redis.asyncio import Redis, RedisCluster
55
from redis.data_structure import WeightedList

redis/asyncio/multidb/failover.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import time
2-
from abc import abstractmethod, ABC
2+
from abc import ABC, abstractmethod
33

44
from redis.asyncio.multidb.database import AsyncDatabase, Databases
5-
from redis.multidb.circuit import State as CBState
65
from redis.data_structure import WeightedList
6+
from redis.multidb.circuit import State as CBState
77
from redis.multidb.exception import (
88
NoValidDatabaseException,
99
TemporaryUnavailableException,

redis/asyncio/multidb/healthcheck.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
import logging
33
from abc import ABC, abstractmethod
44
from enum import Enum
5-
from typing import Optional, Tuple, Union, List
6-
5+
from typing import List, Optional, Tuple, Union
76

87
from redis.asyncio import Redis
9-
from redis.asyncio.http.http_client import AsyncHTTPClientWrapper, DEFAULT_TIMEOUT
10-
from redis.retry import Retry
8+
from redis.asyncio.http.http_client import DEFAULT_TIMEOUT, AsyncHTTPClientWrapper
119
from redis.backoff import NoBackoff
1210
from redis.http.http_client import HttpClient
1311
from redis.multidb.exception import UnhealthyDatabaseException
12+
from redis.retry import Retry
1413

1514
DEFAULT_HEALTH_CHECK_PROBES = 3
1615
DEFAULT_HEALTH_CHECK_INTERVAL = 5
@@ -85,7 +84,7 @@ async def execute(self, health_checks: List[HealthCheck], database) -> bool:
8584
if not await health_check.check_health(database):
8685
return False
8786
except Exception as e:
88-
raise UnhealthyDatabaseException(f"Unhealthy database", database, e)
87+
raise UnhealthyDatabaseException("Unhealthy database", database, e)
8988

9089
if attempt < self.health_check_probes - 1:
9190
await asyncio.sleep(self._health_check_delay)
@@ -117,7 +116,7 @@ async def execute(self, health_checks: List[HealthCheck], database) -> bool:
117116
allowed_unsuccessful_probes -= 1
118117
if allowed_unsuccessful_probes <= 0:
119118
raise UnhealthyDatabaseException(
120-
f"Unhealthy database", database, e
119+
"Unhealthy database", database, e
121120
)
122121

123122
if attempt < self.health_check_probes - 1:
@@ -148,7 +147,7 @@ async def execute(self, health_checks: List[HealthCheck], database) -> bool:
148147
is_healthy = False
149148
except Exception as e:
150149
exception = UnhealthyDatabaseException(
151-
f"Unhealthy database", database, e
150+
"Unhealthy database", database, e
152151
)
153152

154153
if attempt < self.health_check_probes - 1:

redis/background.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import asyncio
22
import threading
3-
from typing import Callable, Coroutine, Any
3+
from typing import Any, Callable, Coroutine
44

55

66
class BackgroundScheduler:

redis/cluster.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3165,7 +3165,7 @@ def _reinitialize_on_error(self, error):
31653165
self._nodes_manager.initialize()
31663166
self.reinitialize_counter = 0
31673167
else:
3168-
if type(error) == MovedError:
3168+
if type(error) is MovedError:
31693169
self._nodes_manager.update_moved_exception(error)
31703170

31713171
self._executing = False

0 commit comments

Comments
 (0)