Merge 8375af4 into 28a7591

jamesls · Aug 26, 2019 · 4dbc549 · 4dbc549
2 parents 28a7591 + 8375af4
commit 4dbc549
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/fakeredis/_server.py b/fakeredis/_server.py
@@ -2097,7 +2097,12 @@ def zremrangebyrank(self, key, start, stop):
 
     @command((Key(ZSet), Int), (bytes, bytes))
     def zscan(self, key, cursor, *args):
-        return self._scan(key.value.items, cursor, *args)
+        new_cursor, ans = self._scan(key.value.items(), cursor, *args)
+        flat = []
+        for (key, score) in ans:
+            flat.append(key)
+            flat.append(Float.encode(score, False))
+        return [new_cursor, flat]
 
     @command((Key(ZSet), bytes))
     def zscore(self, key, member):