Merge branch 'andy'

2 files changed, 5 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index d302860..f245772 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,9 @@
     * Lock objects now store their timeout value as a float. This allows floats
       to be used as timeout values. No changes to existing code required.
     * WATCH now supports multiple keys. Thanks Rich Schumacher.
+    * Broke out some code that was Python 2.4 incompatible. redis-py should
+      now be useable on 2.4, but this hasn't actually been tested. Thanks
+      Dan Colish for the patch.
 * 2.2.3
     * Added support for Hiredis. To use, simply "pip install hiredis" or
       "easy_install hiredis". Thanks for Pieter Noordhuis for the hiredis-py
diff --git a/redis/connection.py b/redis/connection.py
index 648f7a1..9bacb53 100644
--- a/redis/connection.py
+++ b/redis/connection.py
@@ -57,8 +57,8 @@ class BaseConnection(object):
         except socket.error, e:
             if e.args[0] == errno.EPIPE:
                 self.disconnect()
-            if isinstance(e.args, basestring):
-                _errno, errmsg = 'UNKNOWN', e.args
+            if len(e.args) == 1:
+                _errno, errmsg = 'UNKNOWN', e.args[0]
             else:
                 _errno, errmsg = e.args
             raise ConnectionError("Error %s while writing to socket. %s." % \