Attempt to fix hmset command for Redis < 4.0hmset

1 files changed, 9 insertions, 2 deletions

diff --git a/rq/compat/__init__.py b/rq/compat/__init__.py
index d62c89c..d87291a 100644
--- a/rq/compat/__init__.py
+++ b/rq/compat/__init__.py
@@ -4,6 +4,8 @@ from __future__ import (absolute_import, division, print_function,
 
 import sys
 
+from redis.exceptions import ResponseError
+
 
 def is_python_version(*versions):
     for version in versions:
@@ -107,9 +109,14 @@ except ImportError:
 
 
 def hmset(pipe_or_connection, name, mapping):
-    # redis-py versions 3.5.0 and above accept a mapping parameter for hset
+    # redis-py versions 3.5.0 marks hmset as deprecated and introduces
+    # a "mapping" parameter for hset
     try:
-        return pipe_or_connection.hset(name, mapping=mapping)
+        try:
+            return pipe_or_connection.hset(name, mapping=mapping)
+        except ResponseError:
+            # On Redis server < 4.0, we have to fallback to hmset
+            return pipe_or_connection.hmset(name, mapping)
     # earlier versions require hmset to be used
     except TypeError:
         return pipe_or_connection.hmset(name, mapping)