Skip to content
This repository has been archived by the owner on Sep 11, 2019. It is now read-only.

Commit

Permalink
to_bytes
Browse files Browse the repository at this point in the history
  • Loading branch information
blfoster committed Feb 12, 2018
1 parent a6a7cd6 commit 9f4d910
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
5 changes: 3 additions & 2 deletions fakenewsredis.py
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,7 @@ def eval(self, script, numkeys, *keys_and_args):
elif numkeys < 0:
raise ResponseError("Number of keys can't be negative")

keys_and_args = [to_bytes(v) for v in keys_and_args]
lua_runtime = LuaRuntime(unpack_returned_tuples=True)

set_globals = lua_runtime.eval(
Expand All @@ -737,8 +738,8 @@ def eval(self, script, numkeys, *keys_and_args):
)
expected_globals = set()
set_globals(
(None,) + keys_and_args[:numkeys],
(None,) + keys_and_args[numkeys:],
[None] + keys_and_args[:numkeys],
[None] + keys_and_args[numkeys:],
functools.partial(self._lua_redis_call, lua_runtime, expected_globals),
functools.partial(self._lua_redis_pcall, lua_runtime, expected_globals)
)
Expand Down
8 changes: 4 additions & 4 deletions test_fakenewsredis.py
Original file line number Diff line number Diff line change
Expand Up @@ -3178,7 +3178,7 @@ def test_numkeys_float_string(self):

def test_numkeys_integer_string(self):
val = self.redis.eval('return KEYS[1]', "1", "foo")
self.assertEqual(val, "foo")
self.assertEqual(val, b'foo')

def test_numkeys_negative(self):
with self.assertRaises(ResponseError):
Expand Down Expand Up @@ -3221,9 +3221,9 @@ def test_eval_convert_bool(self):
self.assertEqual(val, 1)
self.assertNotIsInstance(val, bool)

def test_eval_convert_nil_to_false(self):
val = self.redis.eval('return ARGV[1] == false', 0, None)
self.assertFalse(val)
def test_eval_none_arg(self):
val = self.redis.eval('return ARGV[1] == "None"', 0, None)
self.assertTrue(val)

def test_eval_return_error(self):
with self.assertRaises(redis.ResponseError) as cm:
Expand Down

0 comments on commit 9f4d910

Please sign in to comment.