Merge branch 'master' into pytest

3 files changed, 8 insertions, 1 deletions

diff --git a/redis/__init__.py b/redis/__init__.py
index 949ea70..8590b1b 100644
--- a/redis/__init__.py
+++ b/redis/__init__.py
@@ -9,6 +9,7 @@ from redis.utils import from_url
 from redis.exceptions import (
     AuthenticationError,
     ConnectionError,
+    BusyLoadingError,
     DataError,
     InvalidResponse,
     PubSubError,
@@ -26,4 +27,5 @@ __all__ = [
     'Connection', 'UnixDomainSocketConnection',
     'RedisError', 'ConnectionError', 'ResponseError', 'AuthenticationError',
     'InvalidResponse', 'DataError', 'PubSubError', 'WatchError', 'from_url',
+    'BusyLoadingError'
 ]
diff --git a/redis/connection.py b/redis/connection.py
index e138d4c..343c838 100644
--- a/redis/connection.py
+++ b/redis/connection.py
@@ -9,6 +9,7 @@ from redis._compat import (b, xrange, imap, byte_to_chr, unicode, bytes, long,
 from redis.exceptions import (
     RedisError,
     ConnectionError,
+    BusyLoadingError,
     ResponseError,
     InvalidResponse,
     AuthenticationError,
@@ -37,7 +38,7 @@ class PythonParser(object):
     EXCEPTION_CLASSES = {
         'ERR': ResponseError,
         'EXECABORT': ExecAbortError,
-        'LOADING': ConnectionError,
+        'LOADING': BusyLoadingError,
         'NOSCRIPT': NoScriptError,
     }
 
diff --git a/redis/exceptions.py b/redis/exceptions.py
index af30cbf..d67afa7 100644
--- a/redis/exceptions.py
+++ b/redis/exceptions.py
@@ -17,6 +17,10 @@ class ConnectionError(ServerError):
     pass
 
 
+class BusyLoadingError(ConnectionError):
+    pass
+
+
 class InvalidResponse(ServerError):
     pass