Merge pull request #1 from tellybug/master

Merge issue jamesls#44 with inherit-redis

fakeredis.py

@@ -844,7 +844,7 @@ def zinterstore(self, dest, keys, aggregate=None):
                                 lambda x: x in
                                 valid_keys)
 
-    def zrange(self, name, start, end, desc=False, withscores=False):
+    def zrange(self, name, start, end, desc=False, withscores=False, score_cast_func=float):
         """
         Return a range of values from sorted set ``name`` between
         ``start`` and ``end`` sorted in ascending order.
@@ -870,15 +870,15 @@ def zrange(self, name, start, end, desc=False, withscores=False):
         if not withscores:
             return items
         else:
-            return [(k, all_items[k]) for k in items]
+            return [(k, score_cast_func(all_items[k])) for k in items]
 
     def _get_zelements_in_order(self, all_items, reverse=False):
         by_keyname = sorted(all_items.items(), key=lambda x: x[0], reverse=reverse)
         in_order = sorted(by_keyname, key=lambda x: x[1], reverse=reverse)
         return [el[0] for el in in_order]
 
     def zrangebyscore(self, name, min, max,
-                      start=None, num=None, withscores=False):
+                      start=None, num=None, withscores=False, score_cast_func=float):
         """
         Return a range of values from the sorted set ``name`` with scores
         between ``min`` and ``max``.
@@ -890,9 +890,9 @@ def zrangebyscore(self, name, min, max,
         The return type is a list of (value, score) pairs
         """
         return self._zrangebyscore(name, min, max, start, num, withscores,
-                                   reverse=False)
+                                   reverse=False, score_cast_func=score_cast_func)
 
-    def _zrangebyscore(self, name, min, max, start, num, withscores, reverse):
+    def _zrangebyscore(self, name, min, max, start, num, withscores, reverse, score_cast_func=float):
         if (start is not None and num is None) or \
                 (num is not None and start is None):
             raise redis.RedisError("``start`` and ``num`` must both "
@@ -907,7 +907,7 @@ def _zrangebyscore(self, name, min, max, start, num, withscores, reverse):
         if start is not None:
             matches = matches[start:start + num]
         if withscores:
-            return [(k, all_items[k]) for k in matches]
+            return [(k, score_cast_func(all_items[k])) for k in matches]
         return matches
 
     def zrank(self, name, value):
@@ -965,7 +965,7 @@ def zremrangebyscore(self, name, min, max):
                 removed += 1
         return removed
 
-    def zrevrange(self, name, start, num, withscores=False):
+    def zrevrange(self, name, start, num, withscores=False, score_cast_func=float):
         """
         Return a range of values from sorted set ``name`` between
         ``start`` and ``num`` sorted in descending order.
@@ -975,10 +975,10 @@ def zrevrange(self, name, start, num, withscores=False):
         ``withscores`` indicates to return the scores along with the values
         The return type is a list of (value, score) pairs
         """
-        return self.zrange(name, start, num, True, withscores)
+        return self.zrange(name, start, num, True, withscores, score_cast_func)
 
     def zrevrangebyscore(self, name, max, min,
-                         start=None, num=None, withscores=False):
+                         start=None, num=None, withscores=False, score_cast_func=float):
         """
         Return a range of values from the sorted set ``name`` with scores
         between ``min`` and ``max`` in descending order.
@@ -990,7 +990,7 @@ def zrevrangebyscore(self, name, max, min,
         The return type is a list of (value, score) pairs
         """
         return self._zrangebyscore(name, min, max, start, num, withscores,
-                                   reverse=True)
+                                   reverse=True, score_cast_func=score_cast_func)
 
     def zrevrank(self, name, value):
         """

test_fakeredis.py

@@ -886,6 +886,14 @@ def test_zrange_descending_with_scores(self):
                                            withscores=True),
                          [('three', 3), ('two', 2), ('one', 1)])
 
+    def test_zrange_descending_with_scores_cast_func(self):
+        self.redis.zadd('foo', one=1)
+        self.redis.zadd('foo', two=2)
+        self.redis.zadd('foo', three=3)
+        self.assertEqual(self.redis.zrange('foo', 0, -1, desc=True,
+                                           withscores=True, score_cast_func=str),
+                         [('three', "3.0"), ('two', "2.0"), ('one', "1.0")])
+
     def test_zrange_with_positive_indices(self):
         self.redis.zadd('foo', one=1)
         self.redis.zadd('foo', two=2)
@@ -998,6 +1006,13 @@ def test_zrangebyscore_withscores(self):
         self.assertEqual(self.redis.zrangebyscore('foo', 1, 3, 0, 2, True),
                          [('one', 1), ('two', 2)])
 
+    def test_zrangebyscore_withscores_cast_func(self):
+        self.redis.zadd('foo', one=1)
+        self.redis.zadd('foo', two=2)
+        self.redis.zadd('foo', three=3)
+        self.assertEqual(self.redis.zrangebyscore('foo', 1, 3, 0, 2, True, score_cast_func=str),
+                         [('one', "1.0"), ('two', "2.0")])
+
     def test_zrevrangebyscore(self):
         self.redis.zadd('foo', one=1)
         self.redis.zadd('foo', two=2)