[PATCH 7/7] python: wrap and use notmuch_database_destroy as destructor

diff --git a/c0/75203aeca42dbfb209c74f7464027b239df327 b/c0/75203aeca42dbfb209c74f7464027b239df327
new file mode 100644 (file)
index 0000000..af187b6
--- /dev/null
+++ b/c0/75203aeca42dbfb209c74f7464027b239df327
@@ -0,0 +1,106 @@
+Return-Path: <teythoon@jade-hamburg.de>\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 BDE33431FD7\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 05:08:55 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 J7DHpRNB5WSo for <notmuch@notmuchmail.org>;\r
+       Sun, 22 Apr 2012 05:08:55 -0700 (PDT)\r
+Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 3B193431FD0\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 05:08:55 -0700 (PDT)\r
+Received: from mail.jade-hamburg.de (mail.jade-hamburg.de [85.183.11.228])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by mail.cryptobitch.de (Postfix) with ESMTPSA id B34475836F8\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Apr 2012 14:08:53 +0200 (CEST)\r
+Received: by mail.jade-hamburg.de (Postfix, from userid 401)\r
+       id 23226DF2A2; Sun, 22 Apr 2012 14:08:53 +0200 (CEST)\r
+Received: from thinkbox.jade-hamburg.de (unknown [10.1.1.153])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested) (Authenticated sender: teythoon)\r
+       by mail.jade-hamburg.de (Postfix) with ESMTPSA id 327E1DF2A6;\r
+       Sun, 22 Apr 2012 14:08:29 +0200 (CEST)\r
+Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77)\r
+       (envelope-from <teythoon@thinkbox.jade-hamburg.de>)\r
+       id 1SLvad-0007B9-GV; Sun, 22 Apr 2012 14:08:27 +0200\r
+From: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 7/7] python: wrap and use notmuch_database_destroy as\r
+       destructor\r
+Date: Sun, 22 Apr 2012 14:07:57 +0200\r
+Message-Id:\r
+ <1335096477-27537-7-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To:\r
+ <1335096477-27537-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+References: <20120422120620.26225.40778@thinkbox.jade-hamburg.de>\r
+       <1335096477-27537-1-git-send-email-4winter@informatik.uni-hamburg.de>\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: Sun, 22 Apr 2012 12:08:56 -0000\r
+\r
+Adapt the python bindings to the notmuch_database_close split.\r
+\r
+Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+---\r
+ bindings/python/notmuch/database.py |   14 ++++++++++----\r
+ 1 file changed, 10 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/bindings/python/notmuch/database.py b/bindings/python/notmuch/database.py\r
+index 44d40fd..268e952 100644\r
+--- a/bindings/python/notmuch/database.py\r
++++ b/bindings/python/notmuch/database.py\r
+@@ -161,8 +161,13 @@ class Database(object):\r
+         else:\r
+             self.create(path)\r
+ \r
++    _destroy = nmlib.notmuch_database_destroy\r
++    _destroy.argtypes = [NotmuchDatabaseP]\r
++    _destroy.restype = None\r
++\r
+     def __del__(self):\r
+-        self.close()\r
++        if self._db:\r
++            self._destroy(self._db)\r
+ \r
+     def _assert_db_is_initialized(self):\r
+         """Raises :exc:`NotInitializedError` if self._db is `None`"""\r
+@@ -218,10 +223,11 @@ class Database(object):\r
+     _close.restype = None\r
+ \r
+     def close(self):\r
+-        """Close and free the notmuch database if needed"""\r
+-        if self._db is not None:\r
++        '''\r
++        Closes the notmuch database.\r
++        '''\r
++        if self._db:\r
+             self._close(self._db)\r
+-            self._db = None\r
+ \r
+     def __enter__(self):\r
+         '''\r
+-- \r
+1.7.10\r
+\r