Fix issues 130 and 131: Support Lua in Python 3 and improve mock signatures

Author: beamerblvd

README.md

@@ -14,7 +14,8 @@ Use pip:
 ## Usage
 
 Both `mockredis.mock_redis_client` and `mockredis.mock_strict_redis_client` can be
-used to patch instances of the *redis client*.
+used to patch instances of the *redis client*, and `get_mock_redis_client_creator`
+can be used to create a generator for more flexible mocks.
 
 For example, using the [mock][mock] library:
 
@@ -24,6 +25,11 @@ Or:
 
     @patch('redis.StrictRedis', mock_strict_redis_client)
 
+Or, for more control:
+
+    @patch('redis.Redis', get_mock_redis_client_creator(load_lua_dependencies=False))
+    @patch('redis.StrictRedis', get_mock_redis_client_creator(strict=True, clock=my_frozen_clock))
+
 ## Testing
 
 Many unit tests exist to verify correctness of mock functionality. In addition, most

mockredis/client.py

@@ -1561,7 +1561,7 @@ def get_total_milliseconds(td):
     return int((td.days * 24 * 60 * 60 + td.seconds) * 1000 + td.microseconds / 1000.0)
 
 
-def mock_redis_client(**kwargs):
+def mock_redis_client(*_, **__):
     """
     Mock common.util.redis_client so we
     can return a MockRedis object
@@ -1572,7 +1572,7 @@ def mock_redis_client(**kwargs):
 mock_redis_client.from_url = mock_redis_client
 
 
-def mock_strict_redis_client(**kwargs):
+def mock_strict_redis_client(*_, **__):
     """
     Mock common.util.redis_client so we
     can return a MockRedis object
@@ -1581,3 +1581,22 @@ def mock_strict_redis_client(**kwargs):
     return MockRedis(strict=True)
 
 mock_strict_redis_client.from_url = mock_strict_redis_client
+
+
+def get_mock_redis_client_creator(**kwargs):
+    """
+    Generate a getter for a MockRedis
+    object that passes the given kwargs
+    to each MockRedis object instantiated
+    by the getter returned. Sample usage:
+
+    @mock.patch('redis.Redis', get_mock_redis_client_creator(load_lua_dependencies=False))
+    @mock.patch('redis.StrictRedis', get_mock_redis_client_creator(strict=True, clock=frozen_clock))
+    """
+
+    def _getter(*_, **__):
+        return MockRedis(**kwargs)
+
+    _getter.from_url = _getter
+
+    return _getter

mockredis/script.py

@@ -2,8 +2,26 @@
 import threading
 from mockredis.exceptions import ResponseError
 
+
 LuaLock = threading.Lock()
 
+if sys.version_info[0] == 3:
+    _string_types = (str, )
+    _integer_types = (int, )
+    _number_types = (int, float)
+    _string_or_binary_types = (str, bytes)
+    _binary_type = bytes
+    _long_type = int
+    _iteritems = lambda d, **kw: iter(d.items(**kw))
+else:
+    _string_types = (basestring, )
+    _integer_types = (int, long)
+    _number_types = (int, long, float)
+    _string_or_binary_types = (basestring, )
+    _binary_type = str
+    _long_type = long
+    _iteritems = lambda d, **kw: d.iteritems(**kw)
+
 
 class Script(object):
     """
@@ -47,7 +65,10 @@ def _call(*call_args):
                 response = client.call(*call_args)
             return self._python_to_lua(response)
 
-        lua_globals.redis = {"call": _call}
+        def _error_reply(err):
+            return self._python_to_lua({'err': err})
+
+        lua_globals.redis = {'call': _call, 'error_reply', _error_reply}
         return self._lua_to_python(lua.execute(self.script), return_status=True)
 
     @staticmethod
@@ -115,11 +136,13 @@ def _lua_to_python(lval, return_status=False):
                         return lval[i]
                     if i == 'err':
                         raise ResponseError(lval[i])
+                    if lval[i] == 'err':
+                        raise ResponseError(lval[i + 1])
                 pval.append(Script._lua_to_python(lval[i]))
             return pval
-        elif isinstance(lval, long):
+        elif isinstance(lval, _integer_types):
             # Lua number --> Python long
-            return long(lval)
+            return _long_type(lval)
         elif isinstance(lval, float):
             # Lua number --> Python float
             return float(lval)
@@ -161,17 +184,17 @@ def _python_to_lua(pval):
             #     in Lua returns: {k1, v1, k2, v2, k3, v3}
             lua_dict = lua.eval("{}")
             lua_table = lua.eval("table")
-            for k, v in pval.iteritems():
+            for k, v in _iteritems(pval):
                 lua_table.insert(lua_dict, Script._python_to_lua(k))
                 lua_table.insert(lua_dict, Script._python_to_lua(v))
             return lua_dict
-        elif isinstance(pval, str):
+        elif isinstance(pval, _string_or_binary_types):
             # Python string --> Lua userdata
             return pval
         elif isinstance(pval, bool):
             # Python bool--> Lua boolean
             return lua.eval(str(pval).lower())
-        elif isinstance(pval, (int, long, float)):
+        elif isinstance(pval, _number_types):
             # Python int --> Lua number
             lua_globals = lua.globals()
             return lua_globals.tonumber(str(pval))

setup.py

@@ -18,7 +18,7 @@
           'nose'
       ],
       extras_require={
-          'lua': ['lunatic-python-bugfix==1.1.1'],
+          'lua': ['lunatic-python-universal~=2.0'],
       },
       tests_require=[
           'redis>=2.9.0'