Merge pull request #1023 from ycraaron/1022-fix-retry-logic

1022: Fix retry logic for StricRedis and PubSub

Author: andymccurdy

redis/client.py

@@ -775,7 +775,8 @@ def execute_command(self, *args, **options):
             return self.parse_response(connection, command_name, **options)
         except (ConnectionError, TimeoutError) as e:
             connection.disconnect()
-            if not connection.retry_on_timeout and isinstance(e, TimeoutError):
+            if not (connection.retry_on_timeout and
+                    isinstance(e, TimeoutError)):
                 raise
             connection.send_command(*args)
             return self.parse_response(connection, command_name, **options)
@@ -3012,7 +3013,8 @@ def _execute(self, connection, command, *args):
             return command(*args)
         except (ConnectionError, TimeoutError) as e:
             connection.disconnect()
-            if not connection.retry_on_timeout and isinstance(e, TimeoutError):
+            if not (connection.retry_on_timeout and
+                    isinstance(e, TimeoutError)):
                 raise
             # Connect manually here. If the Redis server is down, this will
             # fail and raise a ConnectionError as desired.