summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy McCurdy <andy@andymccurdy.com>2013-05-15 14:49:37 -0700
committerAndy McCurdy <andy@andymccurdy.com>2013-05-15 14:49:37 -0700
commitbe862ba56d81a38632c1260dd75d3e44fc1cf0ff (patch)
tree9eecc19dbf9bc23740fadbffdf7079314825999d
parentb5214ab814b6c35aa8f880ef61c0719b851e60e0 (diff)
parent475d964270b13d797e696f0ca4771432f2e7239a (diff)
downloadredis-py-be862ba56d81a38632c1260dd75d3e44fc1cf0ff.tar.gz
Merge pull request #347 from kakwa/master
error in the __call__ method of class Script
-rw-r--r--redis/client.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/redis/client.py b/redis/client.py
index 033fd3d..00ff9a6 100644
--- a/redis/client.py
+++ b/redis/client.py
@@ -1969,7 +1969,8 @@ class Script(object):
def __call__(self, keys=[], args=[], client=None):
"Execute the script, passing any required ``args``"
- client = client or self.registered_client
+ if client is None:
+ client = self.registered_client
args = tuple(keys) + tuple(args)
# make sure the Redis server knows about the script
if isinstance(client, BasePipeline):