From: Thomas Jost Date: Tue, 6 Dec 2011 10:03:22 +0000 (+0100) Subject: python: use wrapped notmuch_*_t types instead of raw pointers X-Git-Tag: 0.11_rc1~67 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=71e0082eff05f52709500109f1a194fdb03571e5;ds=sidebyside python: use wrapped notmuch_*_t types instead of raw pointers Now that types are checked correctly, we also need to make sure that all the arguments actually are instances of these types. Otherwise the function calls will fail and raise an exception similar to this one: ctypes.ArgumentError: argument 3: : expected LP_LP_NotmuchMessageS instance instead of pointer to c_void_p --- diff --git a/bindings/python/notmuch/database.py b/bindings/python/notmuch/database.py index 471adaa5..5b1b00bd 100644 --- a/bindings/python/notmuch/database.py +++ b/bindings/python/notmuch/database.py @@ -79,6 +79,7 @@ class Database(object): _open = nmlib.notmuch_database_open _open.argtypes = [c_char_p, c_uint] _open.restype = NotmuchDatabaseP + #_open.restype = c_void_p """notmuch_database_upgrade""" _upgrade = nmlib.notmuch_database_upgrade @@ -385,7 +386,7 @@ class Database(object): be added. """ self._assert_db_is_initialized() - msg_p = c_void_p() + msg_p = NotmuchMessageP() status = self._add_message(self._db, _str(filename), byref(msg_p)) if not status in [STATUS.SUCCESS, STATUS.DUPLICATE_MESSAGE_ID]: @@ -453,7 +454,7 @@ class Database(object): the database was not intitialized. """ self._assert_db_is_initialized() - msg_p = c_void_p() + msg_p = NotmuchMessageP() status = Database._find_message(self._db, _str(msgid), byref(msg_p)) if status != STATUS.SUCCESS: raise NotmuchError(status) @@ -487,7 +488,7 @@ class Database(object): *Added in notmuch 0.9*""" self._assert_db_is_initialized() - msg_p = c_void_p() + msg_p = NotmuchMessageP() status = Database._find_message_by_filename(self._db, _str(filename), byref(msg_p)) if status != STATUS.SUCCESS: