diff options
| author | andy <andy@whiskeymedia.com> | 2013-06-04 17:23:50 -0400 |
|---|---|---|
| committer | andy <andy@whiskeymedia.com> | 2013-06-04 17:23:50 -0400 |
| commit | 5e30cd66fabe06b67298c4946b412a0f08fdab5c (patch) | |
| tree | edaa2ba95b9b5d943b6e489a4cb5a3cc99718edd /redis/connection.py | |
| parent | 4b0e43eedc457b7f3c41885427c3fc5bd4ade7d1 (diff) | |
| parent | bb16aaf35d15d20c6ae2f3bbfa0d8a3cd1664548 (diff) | |
| download | redis-py-5e30cd66fabe06b67298c4946b412a0f08fdab5c.tar.gz | |
Merge branch 'master' into pytest
Diffstat (limited to 'redis/connection.py')
| -rw-r--r-- | redis/connection.py | 3 |
1 files changed, 2 insertions, 1 deletions
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, } |