Merge tag '0.12_rc2'

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

diff --git a/bindings/python/notmuch/directory.py b/bindings/python/notmuch/directory.py
index 3e0763f256660f06a7550ffd3de656b458ab9f65..284cbdced126952587110f71d8e49d38d4bcd8be 100644 (file)
--- a/bindings/python/notmuch/directory.py
+++ b/bindings/python/notmuch/directory.py
@@ -20,13 +20,15 @@ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>'
 from ctypes import c_uint, c_long
 from notmuch.globals import (
     nmlib,
+    NotmuchDirectoryP,
+    NotmuchFilenamesP
+)
+from .errors import (
     STATUS,
     NotmuchError,
     NotInitializedError,
-    NotmuchDirectoryP,
-    NotmuchFilenamesP
 )
-from .filename import Filenames
+from .filenames import Filenames
 
 class Directory(object):
     """Represents a directory entry in the notmuch directory
@@ -175,7 +177,7 @@ 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"""