diff options
| author | Vitja Makarov <vitja.makarov@gmail.com> | 2013-09-04 23:36:41 +0400 |
|---|---|---|
| committer | Vitja Makarov <vitja.makarov@gmail.com> | 2013-09-04 23:42:16 +0400 |
| commit | 22801335d2826a383edf4a0c020b5249bcea7d30 (patch) | |
| tree | abe65b378c11d438e8bb78e4685c2429fc3c806e | |
| parent | 232b815545c016bb2b6c862d6df8ec16e1c88088 (diff) | |
| download | redis-py-22801335d2826a383edf4a0c020b5249bcea7d30.tar.gz | |
PEP8 fix
| -rw-r--r-- | redis/client.py | 2 | ||||
| -rw-r--r-- | redis/sentinel.py | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/redis/client.py b/redis/client.py index c5ae456..453a4ae 100644 --- a/redis/client.py +++ b/redis/client.py @@ -573,7 +573,7 @@ class StrictRedis(object): def sentinel_get_master_addr_by_name(self, service_name): "Returns pair (host, port) for the given ``service_name``" return self.execute_command('SENTINEL', 'get-master-addr-by-name', - service_name, parse='SENTINEL_ADDR_PORT') + service_name, parse='SENTINEL_ADDR_PORT') def shutdown(self): "Shutdown the server" diff --git a/redis/sentinel.py b/redis/sentinel.py index c41b9fe..d5f5726 100644 --- a/redis/sentinel.py +++ b/redis/sentinel.py @@ -29,7 +29,7 @@ class SentinelManagedConnection(Connection): def connect(self): if self._sock: - return # already connected + return # already connected if self.connection_pool.is_master: self.connect_to(self.connection_pool.get_master_address()) else: @@ -38,7 +38,7 @@ class SentinelManagedConnection(Connection): return self.connect_to(slave) except ConnectionError: continue - raise SlaveNotFoundError # Never be here + raise SlaveNotFoundError # Never be here class SentinelConnectionPool(ConnectionPool): @@ -69,7 +69,7 @@ class SentinelConnectionPool(ConnectionPool): elif self.master_address is None: self.master_address = master_address elif master_address != self.master_address: - self.disconnect() # Master address changed + self.disconnect() # Master address changed return master_address def rotate_slaves(self): @@ -80,7 +80,7 @@ class SentinelConnectionPool(ConnectionPool): self.slave_rr_counter = random.randint(0, len(slaves) - 1) for _ in xrange(len(slaves)): self.slave_rr_counter = ( - self.slave_rr_counter + 1) % len(slaves) + self.slave_rr_counter + 1) % len(slaves) slave = slaves[self.slave_rr_counter] yield slave # Fallback to the master connection @@ -132,8 +132,8 @@ class Sentinel(object): Asks sentinels for master's address corresponding to the service labeled ``service_name``. - Returns a pair (address, port) or raises MasterNotFoundError if no alive - master is found. + Returns a pair (address, port) or raises MasterNotFoundError if no + alive master is found. """ for sentinel_no, sentinel in enumerate(self.sentinels): try: |