summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2012-05-17 15:44:31 +0200
committerGravatar Martin Szulecki2012-05-17 15:44:31 +0200
commit84235e0834e57551028329723f4510e1dbe7bc11 (patch)
tree5cc9820c8954cec6bfc4758b6b8474932087dfdd
parent70dfe8ad1766990386f1db04bbe5a4826bcde4e5 (diff)
downloadlibimobiledevice-84235e0834e57551028329723f4510e1dbe7bc11.tar.gz
libimobiledevice-84235e0834e57551028329723f4510e1dbe7bc11.tar.bz2
cython: Do not override final methods as comply to Cython >= 0.16 strict check
-rw-r--r--cython/afc.pxi2
-rw-r--r--cython/imobiledevice.pxd4
-rw-r--r--cython/imobiledevice.pyx7
-rw-r--r--cython/mobilesync.pxi4
4 files changed, 8 insertions, 9 deletions
diff --git a/cython/afc.pxi b/cython/afc.pxi
index cf72b69..0383471 100644
--- a/cython/afc.pxi
+++ b/cython/afc.pxi
@@ -162,7 +162,7 @@ cdef class AfcClient(BaseService):
162 err = afc_client_free(self._c_client) 162 err = afc_client_free(self._c_client)
163 self.handle_error(err) 163 self.handle_error(err)
164 164
165 cdef inline BaseError _error(self, int16_t ret): 165 cdef BaseError _error(self, int16_t ret):
166 return AfcError(ret) 166 return AfcError(ret)
167 167
168 cpdef list get_device_info(self): 168 cpdef list get_device_info(self):
diff --git a/cython/imobiledevice.pxd b/cython/imobiledevice.pxd
index d0d1ada..3ec8dfb 100644
--- a/cython/imobiledevice.pxd
+++ b/cython/imobiledevice.pxd
@@ -51,8 +51,8 @@ cdef class BaseService(Base):
51cdef class PropertyListService(BaseService): 51cdef class PropertyListService(BaseService):
52 cpdef send(self, plist.Node node) 52 cpdef send(self, plist.Node node)
53 cpdef object receive(self) 53 cpdef object receive(self)
54 cdef inline int16_t _send(self, plist.plist_t node) 54 cdef int16_t _send(self, plist.plist_t node)
55 cdef inline int16_t _receive(self, plist.plist_t* c_node) 55 cdef int16_t _receive(self, plist.plist_t* c_node)
56 56
57cdef extern from "libimobiledevice/lockdown.h": 57cdef extern from "libimobiledevice/lockdown.h":
58 cdef struct lockdownd_client_private: 58 cdef struct lockdownd_client_private:
diff --git a/cython/imobiledevice.pyx b/cython/imobiledevice.pyx
index ffaa3c1..9d2e13d 100644
--- a/cython/imobiledevice.pyx
+++ b/cython/imobiledevice.pyx
@@ -25,9 +25,8 @@ cdef class Base:
25 return 0 25 return 0
26 cdef BaseError err = self._error(ret) 26 cdef BaseError err = self._error(ret)
27 raise err 27 raise err
28 return -1
29 28
30 cdef inline BaseError _error(self, int16_t ret): pass 29 cdef BaseError _error(self, int16_t ret): pass
31 30
32cdef extern from "libimobiledevice/libimobiledevice.h": 31cdef extern from "libimobiledevice/libimobiledevice.h":
33 ctypedef enum idevice_error_t: 32 ctypedef enum idevice_error_t:
@@ -211,10 +210,10 @@ cdef class PropertyListService(BaseService):
211 plist.plist_free(c_node) 210 plist.plist_free(c_node)
212 raise 211 raise
213 212
214 cdef inline int16_t _send(self, plist.plist_t node): 213 cdef int16_t _send(self, plist.plist_t node):
215 raise NotImplementedError("send is not implemented") 214 raise NotImplementedError("send is not implemented")
216 215
217 cdef inline int16_t _receive(self, plist.plist_t* c_node): 216 cdef int16_t _receive(self, plist.plist_t* c_node):
218 raise NotImplementedError("receive is not implemented") 217 raise NotImplementedError("receive is not implemented")
219 218
220cdef class DeviceLinkService(PropertyListService): 219cdef class DeviceLinkService(PropertyListService):
diff --git a/cython/mobilesync.pxi b/cython/mobilesync.pxi
index 0ec4710..e610191 100644
--- a/cython/mobilesync.pxi
+++ b/cython/mobilesync.pxi
@@ -149,10 +149,10 @@ cdef class MobileSyncClient(DeviceLinkService):
149 plist.plist_free(remapping) 149 plist.plist_free(remapping)
150 raise 150 raise
151 151
152 cdef inline int16_t _send(self, plist.plist_t node): 152 cdef int16_t _send(self, plist.plist_t node):
153 return mobilesync_send(self._c_client, node) 153 return mobilesync_send(self._c_client, node)
154 154
155 cdef inline int16_t _receive(self, plist.plist_t* node): 155 cdef int16_t _receive(self, plist.plist_t* node):
156 return mobilesync_receive(self._c_client, node) 156 return mobilesync_receive(self._c_client, node)
157 157
158 cdef inline BaseError _error(self, int16_t ret): 158 cdef inline BaseError _error(self, int16_t ret):