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

Fix cancel methods

Browse Source
This commit is contained in:
Jason Paryani
2014-04-17 20:53:23 -07:00
parent 430890f8d6
commit 16678dc26b
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
capnp/lib/capnp.pyx
View File

@@ -1474,9 +1474,8 @@ cdef class Promise:
if args_length - defaults_length != 1: if args_length - defaults_length != 1:
raise ValueError('Function passed to `then` call must take exactly one argument') raise ValueError('Function passed to `then` call must take exactly one argument')
self.is_consumed = True cdef Promise new_promise = Promise()._init(helpers.then(deref(self.thisptr), <PyObject *>func, <PyObject *>error_func), self)
return Promise()._init(new_promise.thisptr.attach(capnp.makePyRefCounter(<PyObject *>func), capnp.makePyRefCounter(<PyObject *>error_func)), new_promise)
return Promise()._init(helpers.then(deref(self.thisptr), <PyObject *>func, <PyObject *>error_func).attach(capnp.makePyRefCounter(<PyObject *>func), capnp.makePyRefCounter(<PyObject *>error_func)), self)
def attach(self, *args): def attach(self, *args):
if self.is_consumed: if self.is_consumed:
@@ -1487,9 +1486,9 @@ cdef class Promise:
return ret return ret
cpdef cancel(self) except +reraise_kj_exception: cpdef cancel(self, numParents=1) except +reraise_kj_exception:
if self.is_consumed: if numParents > 0 and hasattr(self._parent, 'cancel'):
raise ValueError('Promise was already used in a consuming operation. You can no longer use this Promise object') self._parent.cancel(numParents - 1)
self.is_consumed = True self.is_consumed = True
del self.thisptr del self.thisptr
@@ -1537,7 +1536,8 @@ cdef class _VoidPromise:
if args_length - defaults_length != 0: if args_length - defaults_length != 0:
raise ValueError('Function passed to `then` call must take no arguments') raise ValueError('Function passed to `then` call must take no arguments')
return Promise()._init(helpers.then(deref(self.thisptr), <PyObject *>func, <PyObject *>error_func).attach(capnp.makePyRefCounter(<PyObject *>func), capnp.makePyRefCounter(<PyObject *>error_func)), self) cdef Promise new_promise = Promise()._init(helpers.then(deref(self.thisptr), <PyObject *>func, <PyObject *>error_func), self)
return Promise()._init(new_promise.thisptr.attach(capnp.makePyRefCounter(<PyObject *>func), capnp.makePyRefCounter(<PyObject *>error_func)), new_promise)
cpdef as_pypromise(self) except +reraise_kj_exception: cpdef as_pypromise(self) except +reraise_kj_exception:
if self.is_consumed: if self.is_consumed:
@@ -1553,9 +1553,9 @@ cdef class _VoidPromise:
return ret return ret
cpdef cancel(self) except +reraise_kj_exception: cpdef cancel(self, numParents=1) except +reraise_kj_exception:
if self.is_consumed: if numParents > 0 and hasattr(self._parent, 'cancel'):
raise ValueError('Promise was already used in a consuming operation. You can no longer use this Promise object') self._parent.cancel(numParents - 1)
self.is_consumed = True self.is_consumed = True
del self.thisptr del self.thisptr
@@ -1612,7 +1612,8 @@ cdef class _RemotePromise:
Py_INCREF(func) Py_INCREF(func)
Py_INCREF(error_func) Py_INCREF(error_func)
return Promise()._init(helpers.then(deref(self.thisptr), <PyObject *>func, <PyObject *>error_func).attach(capnp.makePyRefCounter(<PyObject *>func), capnp.makePyRefCounter(<PyObject *>error_func)), self) cdef Promise new_promise = Promise()._init(helpers.then(deref(self.thisptr), <PyObject *>func, <PyObject *>error_func), self)
return Promise()._init(new_promise.thisptr.attach(capnp.makePyRefCounter(<PyObject *>func), capnp.makePyRefCounter(<PyObject *>error_func)), new_promise)
cpdef _get(self, field) except +reraise_kj_exception: cpdef _get(self, field) except +reraise_kj_exception:
cdef int type = (<C_DynamicValue.Pipeline>self.thisptr.get(field)).getType() cdef int type = (<C_DynamicValue.Pipeline>self.thisptr.get(field)).getType()
@@ -1639,9 +1640,9 @@ cdef class _RemotePromise:
def to_dict(self, verbose=False): def to_dict(self, verbose=False):
return _to_dict(self, verbose) return _to_dict(self, verbose)
cpdef cancel(self) except +reraise_kj_exception: cpdef cancel(self, numParents=1) except +reraise_kj_exception:
if self.is_consumed: if numParents > 0 and hasattr(self._parent, 'cancel'):
raise ValueError('Promise was already used in a consuming operation. You can no longer use this Promise object') self._parent.cancel(numParents - 1)
self.is_consumed = True self.is_consumed = True
del self.thisptr del self.thisptr