Merge tag '0.13.2'

[notmuch] / bindings / python / notmuch / directory.py

diff --git a/bindings/python/notmuch/directory.py b/bindings/python/notmuch/directory.py
index 0c5e015e0e01feb9da330e08c2de951f54ed7797..3b0a525dc9083e2c6bcb6c019fa729f42d389fd7 100644 (file)
--- a/bindings/python/notmuch/directory.py
+++ b/bindings/python/notmuch/directory.py
@@ -14,11 +14,11 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with notmuch.  If not, see <http://www.gnu.org/licenses/>.
 
-Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>'
+Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>
 """
 
 from ctypes import c_uint, c_long
-from notmuch.globals import (
+from .globals import (
     nmlib,
     NotmuchDirectoryP,
     NotmuchFilenamesP
@@ -177,9 +177,9 @@ class Directory(object):
 
     _destroy = nmlib.notmuch_directory_destroy
     _destroy.argtypes = [NotmuchDirectoryP]
-    _destroy.argtypes = None
+    _destroy.restype = None
 
     def __del__(self):
         """Close and free the Directory"""
-        if self._dir_p is not None:
+        if self._dir_p:
             self._destroy(self._dir_p)