diff options
| author | Ask Solem <ask@celeryproject.org> | 2015-04-22 19:11:00 +0100 |
|---|---|---|
| committer | Ask Solem <ask@celeryproject.org> | 2015-04-22 19:11:00 +0100 |
| commit | ced401265ad9f9836b2c31aae60bf37f57209591 (patch) | |
| tree | 829db5e272f5ec3567b449757b96f7d2688d6505 | |
| parent | 3f1b9bcb995ea5691525c6d9e0768b1622305917 (diff) | |
| download | kombu-ced401265ad9f9836b2c31aae60bf37f57209591.tar.gz | |
redis.TimeoutError first in redis 2.10.3. Closes #470
| -rw-r--r-- | kombu/transport/redis.py | 4 | ||||
| -rw-r--r-- | requirements/extras/redis.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kombu/transport/redis.py b/kombu/transport/redis.py index 9a524d2f..b278fe1a 100644 --- a/kombu/transport/redis.py +++ b/kombu/transport/redis.py @@ -82,14 +82,14 @@ def get_redis_error_classes(): else: DataError = exceptions.DataError return error_classes_t( - (virtual.Transport.connection_errors + ( + (virtual.Transport.connection_errors + tuple(filter(None, ( InconsistencyError, socket.error, IOError, OSError, exceptions.ConnectionError, exceptions.AuthenticationError, - exceptions.TimeoutError)), + getattr(exceptions, 'TimeoutError', None))))), (virtual.Transport.channel_errors + ( DataError, exceptions.InvalidResponse, diff --git a/requirements/extras/redis.txt b/requirements/extras/redis.txt index 4a645b4a..009cbe7f 100644 --- a/requirements/extras/redis.txt +++ b/requirements/extras/redis.txt @@ -1 +1 @@ -redis>=2.8.0 +redis>=2.10.3 |