Add python3 and python2.5 compatibility

2 files changed, 3 insertions, 3 deletions

diff --git a/redis/client.py b/redis/client.py
index e135776..b3b6f0f 100644
--- a/redis/client.py
+++ b/redis/client.py
@@ -1787,8 +1787,8 @@ class BasePipeline(object):
             try:
                 response.append(
                     self.parse_response(connection, args[0], **options))
-            except ResponseError as error:
-                response.append(error)
+            except ResponseError:
+                response.append(sys.exc_info()[1])
 
         if raise_on_error:
             self.raise_first_error(response)
diff --git a/tests/pipeline.py b/tests/pipeline.py
index 2f8967c..f517a31 100644
--- a/tests/pipeline.py
+++ b/tests/pipeline.py
@@ -198,4 +198,4 @@ class PipelineTestCase(unittest.TestCase):
                 raise
 
         ret = self.client.hgetall('x')
-        self.assertEquals(ret, {'a': 'b'})
+        self.assertEqual(ret, {b('a'): b('b')})