master merge

Author: chayim

redis/commands/core.py

@@ -2520,6 +2520,13 @@ def zrange(self, name, start, end, desc=False, withscores=False,
         ``offset`` and ``num`` are specified, then return a slice of the range.
         Can't be provided when using ``bylex``.
         """
+        # Need to support ``desc`` also when using old redis version
+        # because it was supported in 3.5.3 (of redis-py)
+        if not byscore and not bylex and (offset is None and num is None) \
+                and desc:
+            return self.zrevrange(name, start, end, withscores,
+                                  score_cast_func)
+
         return self._zrange('ZRANGE', None, name, start, end, desc, byscore,
                             bylex, withscores, score_cast_func, offset, num)
 

tests/test_commands.py

@@ -467,7 +467,7 @@ def test_client_kill_filter_by_laddr(self, r, r2):
         client_2_addr = clients_by_name['redis-py-c2'].get('laddr')
         assert r.client_kill_filter(laddr=client_2_addr)
 
-    @skip_if_server_version_lt('2.8.12')
+    @skip_if_server_version_lt('6.0.0')
     @skip_if_redis_enterprise
     def test_client_kill_filter_by_user(self, r, request):
         killuser = 'user_to_kill'
@@ -1888,6 +1888,7 @@ def test_zrange(self, r):
         assert r.zrange('a', 0, 1) == [b'a1', b'a2']
         assert r.zrange('a', 1, 2) == [b'a2', b'a3']
         assert r.zrange('a', 0, 2) == [b'a1', b'a2', b'a3']
+        assert r.zrange('a', 0, 2, desc=True) == [b'a3', b'a2', b'a1']
 
         # withscores
         assert r.zrange('a', 0, 1, withscores=True) == \
@@ -3684,15 +3685,17 @@ def test_restore(self, r):
         assert r.restore(key2, 0, dumpdata)
         assert r.ttl(key2) == -1
 
-        # idletime
+    @skip_if_server_version_lt('5.0.0')
+    def test_restore_idletime(self, r):
         key = 'yayakey'
         r.set(key, 'blee!')
         dumpdata = r.dump(key)
         r.delete(key)
         assert r.restore(key, 0, dumpdata, idletime=5)
         assert r.get(key) == b'blee!'
 
-        # frequency
+    @skip_if_server_version_lt('5.0.0')
+    def test_restore_frequency(self, r):
         key = 'yayakey'
         r.set(key, 'blee!')
         dumpdata = r.dump(key)
@@ -3703,10 +3706,8 @@ def test_restore(self, r):
     @skip_if_server_version_lt('5.0.0')
     @skip_if_redis_enterprise
     def test_replicaof(self, r):
-
         with pytest.raises(redis.ResponseError):
             assert r.replicaof("NO ONE")
-
         assert r.replicaof("NO", "ONE")