fix setDecoder not working, TypeError when reJSON returns None

Author: bentsku

rejson/client.py

@@ -36,7 +36,6 @@ class Client(StrictRedis):
     _encoder = None
     _encode = None
     _decoder = None
-    _decode = None
 
     def __init__(self, encoder=None, decoder=None, *args, **kwargs):
         """
@@ -90,7 +89,14 @@ def setDecoder(self, decoder):
             self._decoder = json.JSONDecoder()
         else:
             self._decoder = decoder
-        self._decode = self._decoder.decode
+
+    def _decode(self, s, *args, **kwargs):
+        try:
+            return self._decoder.decode(s, *args, **kwargs)
+        except TypeError:
+            if s is not None:
+                raise
+            return None
 
     def jsondel(self, name, path=Path.rootPath()):
         """
@@ -113,7 +119,7 @@ def jsonget(self, name, *args, no_escape=False):
 
         else:
             for p in args:
-                    pieces.append(str_path(p))
+                pieces.append(str_path(p))
 
         # Handle case where key doesn't exist. The JSONDecoder would raise a
         # TypeError exception since it can't decode None