From 2636941a177dcbbb0fc1d00fd3213632b55c9b7d Mon Sep 17 00:00:00 2001 From: Kurt Kiefer Date: Tue, 21 Jan 2014 15:30:05 -0800 Subject: Changes to make cython HouseArrestClient functional. Allow HouseArrestClient to initialize the AfcClient without running afc's normal __cinit__ body, and expose send_command and send_request methods to python. Signed-off-by: Martin Szulecki --- cython/afc.pxi | 5 +++-- cython/house_arrest.pxi | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cython/afc.pxi b/cython/afc.pxi index abc1180..e34588f 100644 --- a/cython/afc.pxi +++ b/cython/afc.pxi @@ -171,8 +171,9 @@ cdef class AfcClient(BaseService): __service_name__ = "com.apple.afc" cdef afc_client_t _c_client - def __cinit__(self, iDevice device not None, LockdownServiceDescriptor descriptor, *args, **kwargs): - self.handle_error(afc_client_new(device._c_dev, descriptor._c_service_descriptor, &(self._c_client))) + def __cinit__(self, iDevice device = None, LockdownServiceDescriptor descriptor = None, *args, **kwargs): + if (device is not None and descriptor is not None): + self.handle_error(afc_client_new(device._c_dev, descriptor._c_service_descriptor, &(self._c_client))) def __dealloc__(self): cdef afc_error_t err diff --git a/cython/house_arrest.pxi b/cython/house_arrest.pxi index 2a81213..54eebc1 100644 --- a/cython/house_arrest.pxi +++ b/cython/house_arrest.pxi @@ -48,10 +48,10 @@ cdef class HouseArrestClient(PropertyListService): cdef inline BaseError _error(self, int16_t ret): return HouseArrestError(ret) - cdef send_request(self, plist.Node message): + cpdef send_request(self, plist.Node message): self.handle_error(house_arrest_send_request(self._c_client, message._c_node)) - cdef send_command(self, bytes command, bytes appid): + cpdef send_command(self, bytes command, bytes appid): self.handle_error(house_arrest_send_command(self._c_client, command, appid)) cpdef plist.Node get_result(self): -- cgit v1.1-32-gdbae