Support redis-py 3.0 zadd signature

Signed-off-by: Yehoshua Hershberg <yehoshua@redislabs.com>

Author: jhershberg

mockredis/client.py

@@ -1079,27 +1079,10 @@ def sunionstore(self, dest, keys, *args):
 
     # SORTED SET COMMANDS #
 
-    def zadd(self, name, *args, **kwargs):
+    def zadd(self, name, mappings):
         zset = self._get_zset(name, "ZADD", create=True)
-
-        pieces = []
-
-        # args
-        if len(args) % 2 != 0:
-            raise RedisError("ZADD requires an equal number of "
-                             "values and scores")
-        for i in xrange(len(args) // 2):
-            # interpretation of args order depends on whether Redis
-            # or StrictRedis is used
-            score = args[2 * i + (0 if self.strict else 1)]
-            member = args[2 * i + (1 if self.strict else 0)]
-            pieces.append((member, score))
-
-        # kwargs
-        pieces.extend(kwargs.items())
-
         insert_count = lambda member, score: 1 if zset.insert(self._encode(member), float(score)) else 0  # noqa
-        return sum((insert_count(member, score) for member, score in pieces))
+        return sum((insert_count(member, score) for member, score in mappings.iteritems()))
 
     def zcard(self, name):
         zset = self._get_zset(name, "ZCARD")

mockredis/script.py

@@ -55,6 +55,11 @@ def _call(*call_args):
                 # redis-py hmset takes key value pairs in a dictionary and not as a flat list of arguments.
                 call_iter = iter(call_args)
                 response = client.call(next(call_iter), next(call_iter), dict(izip(call_iter, call_iter)))
+            elif nrm_cmd == 'zadd':
+                score_values = call_args[2:]
+                mappings = {score_values[index + 1]: score
+                            for index, score in enumerate(score_values) if index % 2 == 0}
+                response = client.call('zadd', call_args[1], mappings)
             else:
                 response = client.call(*call_args)
             return self._python_to_lua(response)