summaryrefslogtreecommitdiff
path: root/redis/client.py
diff options
context:
space:
mode:
authorAndy McCurdy <andy@andymccurdy.com>2010-09-29 12:03:52 -0700
committerAndy McCurdy <andy@andymccurdy.com>2010-09-29 12:03:52 -0700
commit3e04eb29b0655f5bec892ed85b4ea7fb1bdb5869 (patch)
treec7a50e21933ce8a993362a927dbb160d25b3ee45 /redis/client.py
parentc338b3cc35e4de342ea857eefc4b318f0a856fbe (diff)
downloadredis-py-3e04eb29b0655f5bec892ed85b4ea7fb1bdb5869.tar.gz
timeout of None to the brpop/blpop is the same as timeout=0
Diffstat (limited to 'redis/client.py')
-rw-r--r--redis/client.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/redis/client.py b/redis/client.py
index 74b1d64..8281435 100644
--- a/redis/client.py
+++ b/redis/client.py
@@ -713,6 +713,8 @@ class Redis(threading.local):
If timeout is 0, then block indefinitely.
"""
+ if timeout is None:
+ timeout = 0
if isinstance(keys, basestring):
keys = [keys]
else:
@@ -731,6 +733,8 @@ class Redis(threading.local):
If timeout is 0, then block indefinitely.
"""
+ if timeout is None:
+ timeout = 0
if isinstance(keys, basestring):
keys = [keys]
else: