add nested dict support

lupa/__init__.py

@@ -63,8 +63,10 @@ def _import_newest_lib():
  raise RuntimeError("Failed to import Lupa binary module.")
  # prefer Lua over LuaJIT and high versions over low versions.
  module_name = max(modules, key=lambda m: (m[1] == 'lua', tuple(map(int, m[2] or '0'))))
-
- _newest_lib = __import__(module_name[0], level=1, fromlist="*", globals=globals())
+ try:
+ _newest_lib = __import__(module_name[0], level=1, fromlist="*", globals=globals())
+ except ModuleNotFoundError:
+ _newest_lib = __import__(module_name[1], level=1, fromlist="*", globals=globals())
  return _newest_lib
 
 

lupa/_lupa.pyx

@@ -50,10 +50,11 @@ cdef object exc_info
 from sys import exc_info
 
 cdef object Mapping
+cdef object Sequence
 try:
- from collections.abc import Mapping
+ from collections.abc import Mapping, Sequence
 except ImportError:
- from collections import Mapping # Py2
+ from collections import Mapping, Sequence # Py2
 
 cdef object wraps
 from functools import wraps
@@ -169,6 +170,10 @@ def lua_type(obj):
  lua.lua_settop(L, old_top)
  unlock_runtime(lua_object._runtime)
 
+cdef inline int _len_as_int(Py_ssize_t obj) except -1:
+ if obj > <Py_ssize_t>INT_MAX:
+ raise OverflowError
+ return <int>obj
 
 @cython.no_gc_clear
 cdef class LuaRuntime:
@@ -520,21 +525,21 @@ cdef class LuaRuntime:
  """
  return self.table_from(items, kwargs)
 
- def table_from(self, *args):
+ def table_from(self, *args, bint recursive=False):
  """Create a new table from Python mapping or iterable.
 
  table_from() accepts either a dict/mapping or an iterable with items.
  Items from dicts are set as key-value pairs; items from iterables
  are placed in the table in order.
 
  Nested mappings / iterables are passed to Lua as userdata
- (wrapped Python objects); they are not converted to Lua tables.
+ (wrapped Python objects). If `recursive` is False, they are not converted to Lua tables.
  """
  assert self._state is not NULL
  cdef lua_State *L = self._state
  lock_runtime(self)
  try:
- return py_to_lua_table(self, L, args)
+ return py_to_lua_table(self, L, args, recursive)
  finally:
  unlock_runtime(self)
 
@@ -1236,7 +1241,7 @@ cdef object resume_lua_thread(_LuaThread thread, tuple args):
  # already terminated
  raise StopIteration
  if args:
- nargs = len(args)
+ nargs = _len_as_int(len(args))
  push_lua_arguments(thread._runtime, co, args)
  with nogil:
  status = lua.lua_resume(co, L, nargs, &nres)
@@ -1482,7 +1487,7 @@ cdef py_object* unpack_userdata(lua_State *L, int n) noexcept nogil:
 cdef int py_function_result_to_lua(LuaRuntime runtime, lua_State *L, object o) except -1:
  if runtime._unpack_returned_tuples and isinstance(o, tuple):
  push_lua_arguments(runtime, L, <tuple>o)
- return len(<tuple>o)
+ return _len_as_int(len(<tuple>o))
  check_lua_stack(L, 1)
  return py_to_lua(runtime, L, o)
 
@@ -1511,7 +1516,7 @@ cdef int py_to_lua_handle_overflow(LuaRuntime runtime, lua_State *L, object o) e
  lua.lua_settop(L, old_top)
  raise
 
-cdef int py_to_lua(LuaRuntime runtime, lua_State *L, object o, bint wrap_none=False) except -1:
+cdef int py_to_lua(LuaRuntime runtime, lua_State *L, object o, bint wrap_none=False, bint recursive=False, dict mapped_objs = None) except -1:
  """Converts Python object to Lua
  Preconditions:
  1 extra slot in the Lua stack
@@ -1563,13 +1568,19 @@ cdef int py_to_lua(LuaRuntime runtime, lua_State *L, object o, bint wrap_none=Fa
  elif isinstance(o, float):
  lua.lua_pushnumber(L, <lua.lua_Number><double>o)
  pushed_values_count = 1
+ elif isinstance(o, _PyProtocolWrapper):
+ type_flags = (<_PyProtocolWrapper> o)._type_flags
+ o = (<_PyProtocolWrapper> o)._obj
+ pushed_values_count = py_to_lua_custom(runtime, L, o, type_flags)
+ elif recursive and isinstance(o, (list, dict, Sequence, Mapping)):
+ if mapped_objs is None:
+ mapped_objs = {}
+ table = py_to_lua_table(runtime, L, (o,), recursive, mapped_objs)
+ (<_LuaObject> table).push_lua_object(L)
+ pushed_values_count = 1
  else:
- if isinstance(o, _PyProtocolWrapper):
- type_flags = (<_PyProtocolWrapper>o)._type_flags
- o = (<_PyProtocolWrapper>o)._obj
- else:
- # prefer __getitem__ over __getattr__ by default
- type_flags = OBJ_AS_INDEX if hasattr(o, '__getitem__') else 0
+ # prefer __getitem__ over __getattr__ by default
+ type_flags = OBJ_AS_INDEX if hasattr(o, '__getitem__') else 0
  pushed_values_count = py_to_lua_custom(runtime, L, o, type_flags)
  return pushed_values_count
 
@@ -1655,7 +1666,7 @@ cdef bytes _asciiOrNone(s):
  return <bytes>s
 
 
-cdef _LuaTable py_to_lua_table(LuaRuntime runtime, lua_State* L, items):
+cdef _LuaTable py_to_lua_table(LuaRuntime runtime, lua_State* L, tuple items, bint recursive=False, dict mapped_objs=None):
  """
  Create a new Lua table and add different kinds of values from the sequence 'items' to it.
 
@@ -1667,13 +1678,20 @@ cdef _LuaTable py_to_lua_table(LuaRuntime runtime, lua_State* L, items):
  old_top = lua.lua_gettop(L)
  lua.lua_newtable(L)
  # FIXME: how to check for failure?
-
+ if recursive and mapped_objs is None:
+ mapped_objs = {}
  try:
  for obj in items:
+ if recursive:
+ if id(obj) not in mapped_objs:
+ mapped_objs[id(obj)] = lua.lua_gettop(L)
+ else:
+ idx = mapped_objs[id(obj)]
+ return new_lua_table(runtime, L, <int>idx)
  if isinstance(obj, dict):
  for key, value in (<dict>obj).items():
- py_to_lua(runtime, L, key, wrap_none=True)
- py_to_lua(runtime, L, value)
+ py_to_lua(runtime, L, key, True, recursive, mapped_objs)
+ py_to_lua(runtime, L, value, False, recursive, mapped_objs)
  lua.lua_rawset(L, -3)
 
  elif isinstance(obj, _LuaTable):
@@ -1689,13 +1707,13 @@ cdef _LuaTable py_to_lua_table(LuaRuntime runtime, lua_State* L, items):
  elif isinstance(obj, Mapping):
  for key in obj:
  value = obj[key]
- py_to_lua(runtime, L, key, wrap_none=True)
- py_to_lua(runtime, L, value)
+ py_to_lua(runtime, L, key, True, recursive, mapped_objs)
+ py_to_lua(runtime, L, value, False, recursive, mapped_objs)
  lua.lua_rawset(L, -3)
 
  else:
  for arg in obj:
- py_to_lua(runtime, L, arg)
+ py_to_lua(runtime, L, arg, False, recursive, mapped_objs)
  lua.lua_rawseti(L, -2, i)
  i += 1
 
@@ -1826,7 +1844,7 @@ cdef object execute_lua_call(LuaRuntime runtime, lua_State *L, Py_ssize_t nargs)
  lua.lua_replace(L, -2)
  lua.lua_insert(L, 1)
  has_lua_traceback_func = True
- result_status = lua.lua_pcall(L, nargs, lua.LUA_MULTRET, has_lua_traceback_func)
+ result_status = lua.lua_pcall(L, <int>nargs, lua.LUA_MULTRET, has_lua_traceback_func)
  if has_lua_traceback_func:
  lua.lua_remove(L, 1)
  results = unpack_lua_results(runtime, L)
@@ -2004,7 +2022,7 @@ cdef bint call_python(LuaRuntime runtime, lua_State *L, py_object* py_obj) excep
  else:
  args = ()
  kwargs = {}
- 
+
  for i in range(nargs):
  arg = py_from_lua(runtime, L, i+2)
  if isinstance(arg, _PyArguments):

lupa/tests/test.py

@@ -632,6 +632,91 @@ def test_table_from_table_iter_indirect(self):
  self.assertEqual(list(table2.keys()), [1, 2, 3])
  self.assertEqual(set(table2.values()), set([1, 2, "foo"]))
 
+ def test_table_from_nested_dict(self):
+ data = {"a": {"a": "foo"}, "b": {"b": "bar"}}
+ table = self.lua.table_from(data, recursive=True)
+ self.assertEqual(table["a"]["a"], "foo")
+ self.assertEqual(table["b"]["b"], "bar")
+ self.lua.globals()["data"] = table
+ self.lua.eval("assert(data.a.a=='foo', 'failed')")
+ self.lua.eval("assert(data.b.b=='bar', 'failed')")
+ self.lua.eval("assert(type(data.a)=='table', 'failed, expect table, got '..type(data.a))")
+ self.lua.eval("assert(type(data.b)=='table', 'failed, expect table, got '..type(data.b))")
+ self.lua.execute("""function itertable(table) 
+ for k,v in pairs(table) do 
+ print(k) 
+ if type(v) == "table" then
+ itertable(v)
+ else
+ print(v)
+ end 
+ end 
+ end
+ print('\\n')
+ itertable(data)
+ """)
+ del self.lua.globals()["data"]
+
+ def test_table_from_nested_list(self):
+ data = {"a": {"a": "foo"}, "b": [1, 2, 3]}
+ table = self.lua.table_from(data, recursive=True)
+ self.assertEqual(table["a"]["a"], "foo")
+ self.assertEqual(table["b"][1], 1)
+ self.assertEqual(table["b"][2], 2)
+ self.assertEqual(table["b"][3], 3)
+ self.lua.globals()["data"] = table
+ self.lua.eval("assert(data.a.a=='foo', 'failed')")
+ self.lua.eval("assert(#data.b==3, 'failed')")
+ self.lua.eval("assert(type(data.a)=='table', 'failed, expect table, got '..type(data.a))")
+ self.lua.eval("assert(type(data.b)=='table', 'failed, expect table, got '..type(data.b))")
+ self.lua.execute("""function itertable(table) 
+ for k,v in pairs(table) do 
+ print(k) 
+ if type(v) == "table" then
+ itertable(v)
+ else
+ print(v)
+ end 
+ end 
+ end
+ print('\\n')
+ itertable(data)
+ """)
+ del self.lua.globals()["data"]
+
+ def test_table_from_nested_list_bad(self):
+ data = {"a": {"a": "foo"}, "b": [1, 2, 3]}
+ table = self.lua.table_from(data, recursive=True) # in this case, lua will get userdata instead of table
+ self.assertEqual(table["a"]["a"], "foo")
+ print(list(table["b"]))
+ self.assertEqual(table["b"][1], 1)
+ self.assertEqual(table["b"][2], 2)
+ self.assertEqual(table["b"][3], 3)
+ self.lua.globals()["data"] = table
+
+ self.lua.eval("assert(type(data.a)=='table', 'failed, expect table, got '..type(data.a))")
+ self.lua.eval("assert(type(data.b)=='table', 'failed, expect table, got '..type(data.b))")
+
+ del self.lua.globals()["data"]
+
+ def test_table_from_self_ref_obj(self):
+ data = {}
+ data["key"] = data
+ l = []
+ l.append(l)
+ data["list"] = l
+ table = self.lua.table_from(data, recursive=True)
+ self.lua.globals()["data"] = table
+ self.lua.eval("assert(type(data)=='table', '')")
+ self.lua.eval("assert(type(data['key'])=='table', '')")
+ self.lua.eval("assert(type(data['list'])=='table', '')")
+ self.lua.eval("assert(data['list']==data['list'][1], 'wrong self-ref list')")
+ self.lua.eval("assert(type(data['key']['key']['key']['key'])=='table', 'wrong self-ref map')")
+ self.lua.eval("assert(type(data['key']['key']['key']['key']['list'])=='table', 'wrong self-ref map')")
+ # self.assertEqual(table["key"], table)
+ # self.assertEqual(table["list"], table["list"][0])
+ del self.lua.globals()["data"]
+
  # FIXME: it segfaults
  # def test_table_from_generator_calling_lua_functions(self):
  # func = self.lua.eval("function (obj) return obj end")