diff options
Diffstat (limited to 'redis/sentinel.py')
| -rw-r--r-- | redis/sentinel.py | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/redis/sentinel.py b/redis/sentinel.py index 17dd75b..06877bd 100644 --- a/redis/sentinel.py +++ b/redis/sentinel.py @@ -24,9 +24,9 @@ class SentinelManagedConnection(Connection): def __repr__(self): pool = self.connection_pool - s = '%s<service=%s%%s>' % (type(self).__name__, pool.service_name) + s = f'{type(self).__name__}<service={pool.service_name}%s>' if self.host: - host_info = ',host=%s,port=%s' % (self.host, self.port) + host_info = f',host={self.host},port={self.port}' s = s % host_info return s @@ -51,9 +51,9 @@ class SentinelManagedConnection(Connection): continue raise SlaveNotFoundError # Never be here - def read_response(self): + def read_response(self, disable_decoding=False): try: - return super().read_response() + return super().read_response(disable_decoding=disable_decoding) except ReadOnlyError: if self.connection_pool.is_master: # When talking to a master, a ReadOnlyError when likely @@ -91,11 +91,8 @@ class SentinelConnectionPool(ConnectionPool): self.sentinel_manager = sentinel_manager def __repr__(self): - return "%s<service=%s(%s)" % ( - type(self).__name__, - self.service_name, - self.is_master and 'master' or 'slave', - ) + role = 'master' if self.is_master else 'slave' + return f"{type(self).__name__}<service={self.service_name}({role})" def reset(self): super().reset() @@ -106,7 +103,7 @@ class SentinelConnectionPool(ConnectionPool): check = not self.is_master or \ (self.is_master and self.master_address == (connection.host, connection.port)) - parent = super(SentinelConnectionPool, self) + parent = super() return check and parent.owns_connection(connection) def get_master_address(self): @@ -136,10 +133,10 @@ class SentinelConnectionPool(ConnectionPool): yield self.get_master_address() except MasterNotFoundError: pass - raise SlaveNotFoundError('No slave found for %r' % (self.service_name)) + raise SlaveNotFoundError(f'No slave found for {self.service_name!r}') -class Sentinel(SentinelCommands, object): +class Sentinel(SentinelCommands): """ Redis Sentinel cluster client @@ -205,13 +202,10 @@ class Sentinel(SentinelCommands, object): def __repr__(self): sentinel_addresses = [] for sentinel in self.sentinels: - sentinel_addresses.append('%s:%s' % ( - sentinel.connection_pool.connection_kwargs['host'], - sentinel.connection_pool.connection_kwargs['port'], + sentinel_addresses.append('{host}:{port}'.format_map( + sentinel.connection_pool.connection_kwargs, )) - return '%s<sentinels=[%s]>' % ( - type(self).__name__, - ','.join(sentinel_addresses)) + return f'{type(self).__name__}<sentinels=[{",".join(sentinel_addresses)}]>' def check_master_state(self, state, service_name): if not state['is_master'] or state['is_sdown'] or state['is_odown']: @@ -240,7 +234,7 @@ class Sentinel(SentinelCommands, object): self.sentinels[0], self.sentinels[sentinel_no] = ( sentinel, self.sentinels[0]) return state['ip'], state['port'] - raise MasterNotFoundError("No master found for %r" % (service_name,)) + raise MasterNotFoundError(f"No master found for {service_name!r}") def filter_slaves(self, slaves): "Remove slaves that are in an ODOWN or SDOWN state" |