Merge branch 'master' of github.com:andymccurdy/redis-py

1 files changed, 2 insertions, 1 deletions

diff --git a/redis/client.py b/redis/client.py
index 2aab306..352e98a 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):