Merge pull request #338 from stephan-hof/corrupted_pipeline_socket

socket gets corrupted if errors in pipeline happen

1 files changed, 9 insertions, 2 deletions

diff --git a/redis/client.py b/redis/client.py
index 0369d30..d9506e6 100644
--- a/redis/client.py
+++ b/redis/client.py
@@ -1794,8 +1794,15 @@ class BasePipeline(object):
             starmap(connection.pack_command,
                     [args for args, options in commands]))
         connection.send_packed_command(all_cmds)
-        response = [self.parse_response(connection, args[0], **options)
-                    for args, options in commands]
+
+        response = []
+        for args, options in commands:
+            try:
+                response.append(
+                    self.parse_response(connection, args[0], **options))
+            except ResponseError:
+                response.append(sys.exc_info()[1])
+
         if raise_on_error:
             self.raise_first_error(response)
         return response