Fix lists of lists or dicts for from_dict

2013-09-04 22:00:42 -07:00
parent 6516b7b178
commit a3f4cf3726
1 changed files with 2 additions and 2 deletions
--- a/capnp/capnp.pyx
+++ b/capnp/capnp.pyx
@@ -453,10 +453,10 @@ cdef _from_dict_helper(msg, field, d):
        for key, val in d.iteritems():
            if key != 'which':
                _from_dict_helper(sub_msg, key, val)
-    elif d_type is list:
+    elif d_type is list and len(d) > 0:
        l = msg.init(field, len(d))
        for i in range(len(d)):
-            if d_type is dict:
+            if isinstance(d[i], (dict, list)):
                for key, val in d[i].iteritems():
                    if key != 'which':
                        _from_dict_helper(l[i], key, val)