mostly fixes #456. there's still an issue w/ hiredis and multi-bulk replies

1 files changed, 9 insertions, 6 deletions

diff --git a/redis/client.py b/redis/client.py
index 91807b1..136aade 100644
--- a/redis/client.py
+++ b/redis/client.py
@@ -2257,12 +2257,15 @@ class BasePipeline(object):
         except ConnectionError:
             conn.disconnect()
             # if we're not already watching, we can safely retry the command
-            # assuming it was a connection timeout
-            if not self.watching:
-                conn.send_command(*args)
-                return self.parse_response(conn, command_name, **options)
-            self.reset()
-            raise
+            try:
+                if not self.watching:
+                    conn.send_command(*args)
+                    return self.parse_response(conn, command_name, **options)
+            except ConnectionError:
+                # the retry failed so cleanup.
+                conn.disconnect()
+                self.reset()
+                raise
 
     def pipeline_execute_command(self, *args, **options):
         """