IQ.Lvbs/pycapnp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug in to_dict not handling which fields properly. Also add

Browse Source 
exception for fields of type Object, since they're currently unhandled
This commit is contained in:
Jason Paryani
2013-09-05 16:43:54 -07:00
parent a3f4cf3726
commit fa5fe5a92c
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
capnp/capnp.pyx
View File

@@ -351,7 +351,9 @@ cdef to_python_reader(C_DynamicValue.Reader self, object parent):
return fixMaybe(self.asEnum().getEnumerant()).getProto().getName().cStr() return fixMaybe(self.asEnum().getEnumerant()).getProto().getName().cStr()
elif type == capnp.TYPE_VOID: elif type == capnp.TYPE_VOID:
return None return None
elif type == capnp.TYPE_UNKOWN: elif type == capnp.TYPE_OBJECT:
raise ValueError("Cannot convert type to Python. Object type is not supported in pycapnp yet")
elif type == capnp.TYPE_UNKNOWN:
raise ValueError("Cannot convert type to Python. Type is unknown by capnproto library") raise ValueError("Cannot convert type to Python. Type is unknown by capnproto library")
else: else:
raise ValueError("Cannot convert type to Python. Type is unhandled by capnproto library") raise ValueError("Cannot convert type to Python. Type is unhandled by capnproto library")
@@ -379,7 +381,9 @@ cdef to_python_builder(C_DynamicValue.Builder self, object parent):
return fixMaybe(self.asEnum().getEnumerant()).getProto().getName().cStr() return fixMaybe(self.asEnum().getEnumerant()).getProto().getName().cStr()
elif type == capnp.TYPE_VOID: elif type == capnp.TYPE_VOID:
return None return None
elif type == capnp.TYPE_UNKOWN: elif type == capnp.TYPE_OBJECT:
raise ValueError("Cannot convert type to Python. Object type is not supported in pycapnp yet")
elif type == capnp.TYPE_UNKNOWN:
raise ValueError("Cannot convert type to Python. Type is unknown by capnproto library") raise ValueError("Cannot convert type to Python. Type is unknown by capnproto library")
else: else:
raise ValueError("Cannot convert type to Python. Type is unhandled by capnproto library") raise ValueError("Cannot convert type to Python. Type is unhandled by capnproto library")
@@ -425,19 +429,23 @@ cdef _setDynamicField(_DynamicSetterClasses thisptr, field, value, parent):
cdef _to_dict(msg): cdef _to_dict(msg):
msg_type = type(msg) msg_type = type(msg)
print msg_type
if msg_type is _DynamicListBuilder or msg_type is _DynamicListReader or msg_type is _DynamicResizableListBuilder: if msg_type is _DynamicListBuilder or msg_type is _DynamicListReader or msg_type is _DynamicResizableListBuilder:
print 'in list'
return [_to_dict(x) for x in msg] return [_to_dict(x) for x in msg]
if msg_type is _DynamicStructBuilder or msg_type is _DynamicStructReader: if msg_type is _DynamicStructBuilder or msg_type is _DynamicStructReader:
print 'in struct'
ret = {} ret = {}
try: try:
which = msg.which() which = msg.which()
ret['which'] = which ret['which'] = which
ret[which] = getattr(msg, which) ret[which] = _to_dict(getattr(msg, which))
except ValueError: except ValueError:
pass pass
for field in msg.schema.non_union_fields: for field in msg.schema.non_union_fields:
print field
if msg._has(field): if msg._has(field):
ret[field] = _to_dict(getattr(msg, field)) ret[field] = _to_dict(getattr(msg, field))