summaryrefslogtreecommitdiff
path: root/redis/client.py
diff options
context:
space:
mode:
authorDan Colish <dcolish@gmail.com>2011-03-14 15:38:17 -0400
committerDan Colish <dcolish@gmail.com>2011-03-14 15:38:17 -0400
commit7a9fea265989916d0db910d3d049e085a43044af (patch)
treea022e1a46fad8e27278d7cff8518969b559ab1be /redis/client.py
parente4ca183733535222018b86edb4d23697be0f49b8 (diff)
parent636d2425c08fdf91432cbb82f67a7ccf59e4ef2f (diff)
downloadredis-py-7a9fea265989916d0db910d3d049e085a43044af.tar.gz
Merge branch 'andy'
Diffstat (limited to 'redis/client.py')
-rw-r--r--redis/client.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/redis/client.py b/redis/client.py
index 21d59f5..b091e23 100644
--- a/redis/client.py
+++ b/redis/client.py
@@ -596,14 +596,14 @@ class Redis(threading.local):
"Returns the type of key ``name``"
return self.execute_command('TYPE', name)
- def watch(self, name):
+ def watch(self, *names):
"""
- Watches the value at key ``name``, or None of the key doesn't exist
+ Watches the values at keys ``names``, or None if the key doesn't exist
"""
if self.subscribed:
raise RedisError("Can't call 'watch' from a pipeline'")
- return self.execute_command('WATCH', name)
+ return self.execute_command('WATCH', *names)
def unwatch(self):
"""