Adapting mockredis to support futurize's types and python 3

Author: guyco-redis

mockredis/client.py

@@ -10,6 +10,7 @@
 import sys
 import time
 import fnmatch
+from future.builtins import bytes as newbytes
 
 from mockredis.clock import SystemClock
 from mockredis.lock import MockRedisLock
@@ -22,6 +23,7 @@
     long = int
     xrange = range
     basestring = str
+    unicode = str
     from functools import reduce
 
 
@@ -165,8 +167,15 @@ def keys(self, pattern='*'):
         regex = fnmatch.translate(pattern)
         regex = re.compile(re.sub(r'(^|[^\\])\.', r'\1[^/]', regex))
 
+        keys = []
+
         # Find every key that matches the pattern
-        return [key for key in self.redis.keys() if regex.match(key.decode('utf-8'))]
+        for key in self.redis.keys():
+            decoded_key = key if isinstance(key, unicode) else key.decode('utf-8')
+            if regex.match(decoded_key):
+                keys.append(key)
+
+        return keys
 
     def delete(self, *keys):
         """Emulate delete."""
@@ -1303,7 +1312,8 @@ def script_kill(self):
 
     def script_load(self, script):
         """Emulate script_load"""
-        sha_digest = sha1(script.encode("utf-8")).hexdigest()
+        encoded_script = script if isinstance(script, bytes) else script.encode("utf-8")
+        sha_digest = sha1(encoded_script).hexdigest()
         self.shas[sha_digest] = script
         return sha_digest
 
@@ -1521,9 +1531,9 @@ def _score_inclusive(self, score):
         return True, float(score)
 
     def _encode(self, value):
-        "Return a bytestring representation of the value. Taken from redis-py connection.py"
-        if isinstance(value, bytes):
-            return value
+        "Return a bytestring representation of the value. Originally taken from redis-py connection.py"
+        if isinstance(value, (newbytes, bytes)):
+            return str(value)
         elif isinstance(value, (int, long)):
             value = str(value).encode('utf-8')
         elif isinstance(value, float):
@@ -1532,6 +1542,10 @@ def _encode(self, value):
             value = str(value).encode('utf-8')
         else:
             value = value.encode('utf-8', 'strict')
+
+        if isinstance(value, bytes):
+            value = value.decode('utf-8', 'strict')
+
         return value
 
     def _log(self, level, msg):

mockredis/script.py

@@ -7,6 +7,9 @@
 except ImportError:
     # Python 3
     izip = zip
+    basestring = str
+    long = int
+
 from mockredis.exceptions import ResponseError
 
 LuaLock = threading.Lock()

setup.py

@@ -15,7 +15,8 @@
       license='Apache2',
       packages=find_packages(exclude=['*.tests']),
       setup_requires=[
-          'nose'
+          'nose',
+          'future'
       ],
       extras_require={
           'lua': ['lunatic-python-bugfix==1.1.1'],