[PATCH v2 4/6] python: Update Python bindings for new notmuch_database_{open, create...

diff --git a/76/18c4e5913eb1b7e8bbca412f72f7ff599901ea b/76/18c4e5913eb1b7e8bbca412f72f7ff599901ea
new file mode 100644 (file)
index 0000000..c3d8fe1
--- /dev/null
+++ b/76/18c4e5913eb1b7e8bbca412f72f7ff599901ea
@@ -0,0 +1,144 @@
+Return-Path: <amthrax@drake.mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 9951C429E3F\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Apr 2012 09:25:45 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id PzfAeCKQVwmj for <notmuch@notmuchmail.org>;\r
+       Mon, 30 Apr 2012 09:25:44 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+       [18.7.68.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id BB4FD431FAF\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Apr 2012 09:25:44 -0700 (PDT)\r
+X-AuditID: 12074424-b7fae6d000000906-eb-4f9ebd08a482\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id A1.7E.02310.80DBE9F4; Mon, 30 Apr 2012 12:25:44 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q3UGPiYH029836; \r
+       Mon, 30 Apr 2012 12:25:44 -0400\r
+Received: from drake.mit.edu\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q3UGPgZ1005258\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Mon, 30 Apr 2012 12:25:43 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1SOtPy-0006HD-0T; Mon, 30 Apr 2012 12:25:42 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 4/6] python: Update Python bindings for new\r
+       notmuch_database_{open, create} signatures\r
+Date: Mon, 30 Apr 2012 12:25:36 -0400\r
+Message-Id: <1335803138-24024-5-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1335803138-24024-1-git-send-email-amdragon@mit.edu>\r
+References: <1335651473-19652-1-git-send-email-amdragon@mit.edu>\r
+       <1335803138-24024-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsUixCmqrcuxd56/wYl34hbXb85kdmD0eLbq\r
+       FnMAYxSXTUpqTmZZapG+XQJXxquZG5gKFotULFl9g7mB8TFfFyMnh4SAicS52c8YIWwxiQv3\r
+       1rN1MXJxCAnsY5T4cOgmI4SzgVHi1uJD7BDOfSaJtVPPQZXNZ5TYcvMbG0g/m4CGxLb9y8Fm\r
+       iQhIS+y8O5u1i5GDg1lATeJPlwpIWFggQ2LSmqlMIDaLgKrEp1UrWEFsXgEHiY19G5ggzlCQ\r
+       eLbuOJjNKeAocevANxYQW0igXGLjhU+MExj5FzAyrGKUTcmt0s1NzMwpTk3WLU5OzMtLLdI1\r
+       18vNLNFLTSndxAgKG3YXlR2MzYeUDjEKcDAq8fC+XDjPX4g1say4MvcQoyQHk5Ior+4eoBBf\r
+       Un5KZUZicUZ8UWlOavEhRgkOZiUR3tKJQDnelMTKqtSifJiUNAeLkjivhtY7PyGB9MSS1OzU\r
+       1ILUIpisDAeHkgSvPchQwaLU9NSKtMycEoQ0EwcnyHAeoOFgNbzFBYm5xZnpEPlTjIpS4rwM\r
+       IAkBkERGaR5cLyyuXzGKA70izCsBUsUDTAlw3a+ABjMBDc43BxtckoiQkmpgPFzhNnHxYqOs\r
+       aUvTVpoHLH7Oubz/d8WH+tblqe4Od6JFKkIs4u3t5uxWPZe9qmxGv73SZWuLL2ZV0SHbHn5u\r
+       mBXvNa372ovn0x6s6C49NTM/nkdz5b3nj7a8qCpxmfZiijDLIotTLI1TLZ9FOCcw7mHlX7bF\r
+       /nZCY4uNLOdpQ8nCfx91sxrPKbEUZyQaajEXFScCAOYG0czGAgAA\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 30 Apr 2012 16:25:45 -0000\r
+\r
+---\r
+ bindings/python/notmuch/database.py |   29 ++++++++++++++++-------------\r
+ 1 files changed, 16 insertions(+), 13 deletions(-)\r
+\r
+diff --git a/bindings/python/notmuch/database.py b/bindings/python/notmuch/database.py\r
+index 268e952..adc0a3f 100644\r
+--- a/bindings/python/notmuch/database.py\r
++++ b/bindings/python/notmuch/database.py\r
+@@ -95,8 +95,8 @@ class Database(object):\r
+ \r
+     """notmuch_database_open"""\r
+     _open = nmlib.notmuch_database_open\r
+-    _open.argtypes = [c_char_p, c_uint]\r
+-    _open.restype = NotmuchDatabaseP\r
++    _open.argtypes = [c_char_p, c_uint, POINTER(NotmuchDatabaseP)]\r
++    _open.restype = c_uint\r
+ \r
+     """notmuch_database_upgrade"""\r
+     _upgrade = nmlib.notmuch_database_upgrade\r
+@@ -122,8 +122,8 @@ class Database(object):\r
+ \r
+     """notmuch_database_create"""\r
+     _create = nmlib.notmuch_database_create\r
+-    _create.argtypes = [c_char_p]\r
+-    _create.restype = NotmuchDatabaseP\r
++    _create.argtypes = [c_char_p, POINTER(NotmuchDatabaseP)]\r
++    _create.restype = c_uint\r
+ \r
+     def __init__(self, path = None, create = False,\r
+                  mode = MODE.READ_ONLY):\r
+@@ -193,12 +193,13 @@ class Database(object):\r
+             raise NotmuchError(message="Cannot create db, this Database() "\r
+                                        "already has an open one.")\r
+ \r
+-        res = Database._create(_str(path), Database.MODE.READ_WRITE)\r
++        db = NotmuchDatabaseP()\r
++        status = Database._create(_str(path), Database.MODE.READ_WRITE, byref(db))\r
+ \r
+-        if not res:\r
+-            raise NotmuchError(\r
+-                message="Could not create the specified database")\r
+-        self._db = res\r
++        if status != STATUS.SUCCESS:\r
++            raise NotmuchError(status)\r
++        self._db = db\r
++        return status\r
+ \r
+     def open(self, path, mode=0):\r
+         """Opens an existing database\r
+@@ -212,11 +213,13 @@ class Database(object):\r
+         :raises: Raises :exc:`NotmuchError` in case of any failure\r
+                     (possibly after printing an error message on stderr).\r
+         """\r
+-        res = Database._open(_str(path), mode)\r
++        db = NotmuchDatabaseP()\r
++        status = Database._open(_str(path), mode, byref(db))\r
+ \r
+-        if not res:\r
+-            raise NotmuchError(message="Could not open the specified database")\r
+-        self._db = res\r
++        if status != STATUS.SUCCESS:\r
++            raise NotmuchError(status)\r
++        self._db = db\r
++        return status\r
+ \r
+     _close = nmlib.notmuch_database_close\r
+     _close.argtypes = [NotmuchDatabaseP]\r
+-- \r
+1.7.9.1\r
+\r