fix for #358 and #351

Author: andy

CHANGES

@@ -1,8 +1,14 @@
-* 2.8.0 (in development)
+* 2.7.6
     * Added CONFIG RESETSTAT command. Thanks Yossi Gottlieb.
     * Fixed a bug introduced in 2.7.3 that caused issues with script objects
       and pipelines. Thanks Carpentier Pierre-Francois.
     * Converted redis-py's test suite to use the awesome py.test library.
+    * Fixed a bug introduced in 2.7.5 that prevented a ConnectionError from
+      being raised when the Redis server is LOADING data.
+    * Added a BusyLoadingError exception that's raised when the Redis server
+      is starting up and not accepting commands yet. BusyLoadingError
+      subclasses ConnectionError, which this state previously returned.
+      Thanks Yossi Gottlieb.
 * 2.7.5
     * DEL, HDEL and ZREM commands now return the numbers of keys deleted
       instead of just True/False.

redis/connection.py

@@ -113,9 +113,16 @@ def read_response(self):
         # server returned an error
         if byte == '-':
             response = nativestr(response)
-            # *return*, not raise the exception class. if it is meant to be
-            # raised, it will be at a higher level.
-            return self.parse_error(response)
+            error = self.parse_error(response)
+            # if the error is a ConnectionError, raise immediately so the user
+            # is notified
+            if isinstance(error, ConnectionError):
+                raise error
+            # otherwise, we're dealing with a ResponseError that might belong
+            # inside a pipeline response. the connection's read_response()
+            # and/or the pipeline's execute() will raise this error if
+            # necessary, so just return the exception instance here.
+            return error
         # single value
         elif byte == '+':
             pass