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

Fix changed API for DynamicObject/ObjectPointer

Browse Source
This commit is contained in:
Jason Paryani
2013-09-24 11:49:38 -07:00
parent 46049ecc36
commit 630d4467bc
2 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
capnp/capnp.pyx
View File

@@ -9,7 +9,7 @@
cimport cython
cimport capnp_cpp as capnp
cimport schema_cpp
from capnp_cpp cimport Schema as C_Schema, StructSchema as C_StructSchema, DynamicStruct as C_DynamicStruct, DynamicValue as C_DynamicValue, Type as C_Type, DynamicList as C_DynamicList, fixMaybe, getEnumString, SchemaParser as C_SchemaParser, ParsedSchema as C_ParsedSchema, VOID, ArrayPtr, StringPtr, String, StringTree, DynamicOrphan as C_DynamicOrphan, DynamicObject as C_DynamicObject, WordArrayPtr
from capnp_cpp cimport Schema as C_Schema, StructSchema as C_StructSchema, DynamicStruct as C_DynamicStruct, DynamicValue as C_DynamicValue, Type as C_Type, DynamicList as C_DynamicList, fixMaybe, getEnumString, SchemaParser as C_SchemaParser, ParsedSchema as C_ParsedSchema, VOID, ArrayPtr, StringPtr, String, StringTree, DynamicOrphan as C_DynamicOrphan, ObjectPointer as C_DynamicObject, WordArrayPtr
from schema_cpp cimport Node as C_Node, EnumNode as C_EnumNode
from cython.operator cimport dereference as deref
@@ -382,7 +382,7 @@ cdef to_python_builder(C_DynamicValue.Builder self, object parent):
elif type == capnp.TYPE_VOID:
return None
elif type == capnp.TYPE_OBJECT:
raise ValueError("Cannot convert type to Python. Type is 'Object', but is being used improperly. You can only get 'Object' types from a struct")
return _DynamicObjectBuilder()._init(self.asObject(), parent)
elif type == capnp.TYPE_UNKNOWN:
raise ValueError("Cannot convert type to Python. Type is unknown by capnproto library")
else:
@@ -620,20 +620,8 @@ cdef class _DynamicStructBuilder:
cdef _get(self, field):
cdef C_DynamicValue.Builder value = self.thisptr.get(field)
if value.getType() == capnp.TYPE_OBJECT:
return _DynamicObjectBuilder(field, self)
else:
return to_python_builder(value, self._parent)
cpdef _get_object(self, field, schema):
cdef _StructSchema s
if hasattr(schema, 'schema'):
s = schema.schema
else:
s = schema
return _DynamicStructBuilder()._init(self.thisptr.getObject(field, s.thisptr), self._parent)
return to_python_builder(value, self._parent)
def __getattr__(self, field):
return self._get(field)
@@ -800,16 +788,24 @@ cdef class _DynamicObjectReader:
else:
s = schema
return _DynamicStructReader()._init(self.thisptr.as(s.thisptr), self._parent)
return _DynamicStructReader()._init(self.thisptr.getAs(s.thisptr), self._parent)
cdef class _DynamicObjectBuilder:
cdef public object _field, _parent_struct
def __init__(self, field, parent_struct):
self._field = field
self._parent_struct = parent_struct
cdef C_DynamicObject.Builder * thisptr
cdef public object _parent
cdef _init(self, C_DynamicObject.Builder other, object parent):
self.thisptr = new C_DynamicObject.Builder(other)
self._parent = parent
return self
cpdef as_struct(self, schema):
return self._parent_struct._get_object(self._field, schema)
cdef _StructSchema s
if hasattr(schema, 'schema'):
s = schema.schema
else:
s = schema
return _DynamicStructBuilder()._init(self.thisptr.getAs(s.thisptr), self._parent)
cdef class _Schema:
cdef C_Schema thisptr