py3k: The ConfigParser module has been renamed to configparser

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

diff --git a/bindings/python/notmuch/globals.py b/bindings/python/notmuch/globals.py
index 36354fcec5ec1cf83ddffca17c4aeeccc898decc..54a49b2d3f16895a8a8ce0b9ffc459b58a7cadf2 100644 (file)
--- a/bindings/python/notmuch/globals.py
+++ b/bindings/python/notmuch/globals.py
@@ -18,7 +18,6 @@ Copyright 2010 Sebastian Spaeth <Sebastian@SSpaeth.de>'
 """
 
 from ctypes import CDLL, c_char_p, c_int, Structure, POINTER
-from ctypes.util import find_library
 
 #-----------------------------------------------------------------------------
 #package-global instance of the notmuch library
@@ -49,11 +48,11 @@ class Status(Enum):
 
     @classmethod
     def status2str(self, status):
-        """Get a string representation of a notmuch_status_t value."""
+        """Get a (unicode) string representation of a notmuch_status_t value."""
         # define strings for custom error messages
         if status == STATUS.NOT_INITIALIZED:
-            return "Operation on uninitialized object impossible."
-        return str(Status._status2str(status))
+            return u"Operation on uninitialized object impossible."
+        return unicode(Status._status2str(status))
 
 STATUS = Status(['SUCCESS',
   'OUT_OF_MEMORY',
@@ -89,6 +88,7 @@ Invoke the class method `notmuch.STATUS.status2str` with a status value as
 argument to receive a human readable string"""
 STATUS.__name__ = 'STATUS'
 
+
 class NotmuchError(Exception):
     """Is initiated with a (notmuch.STATUS[, message=None]). It will not
     return an instance of the class NotmuchError, but a derived instance
@@ -97,7 +97,8 @@ class NotmuchError(Exception):
 
     @classmethod
     def get_exc_subclass(cls, status):
-        """Returns a fine grained Exception() type,detailing the error status"""
+        """Returns a fine grained Exception() type,
+        detailing the error status"""
         subclasses = {
             STATUS.OUT_OF_MEMORY: OutOfMemoryError,
             STATUS.READ_ONLY_DATABASE: ReadOnlyDatabaseError,
@@ -109,7 +110,7 @@ class NotmuchError(Exception):
             STATUS.TAG_TOO_LONG: TagTooLongError,
             STATUS.UNBALANCED_FREEZE_THAW: UnbalancedFreezeThawError,
             STATUS.UNBALANCED_ATOMIC: UnbalancedAtomicError,
-            STATUS.NOT_INITIALIZED: NotInitializedError
+            STATUS.NOT_INITIALIZED: NotInitializedError,
         }
         assert 0 < status <= len(subclasses)
         return subclasses[status]
@@ -125,7 +126,7 @@ class NotmuchError(Exception):
         # no 'status' or cls is subclass already, return 'cls' instance
         if not status or cls != NotmuchError:
             return super(NotmuchError, cls).__new__(cls)
-        subclass = cls.get_exc_subclass(status) # which class to use?
+        subclass = cls.get_exc_subclass(status)  # which class to use?
         return subclass.__new__(subclass, *args, **kwargs)
 
     def __init__(self, status=None, message=None):
@@ -133,35 +134,59 @@ class NotmuchError(Exception):
         self.message = message
 
     def __str__(self):
+        return unicode(self).encode('utf-8')
+
+    def __unicode__(self):
         if self.message is not None:
             return self.message
         elif self.status is not None:
             return STATUS.status2str(self.status)
         else:
-            return 'Unknown error'
+            return u'Unknown error'
+
 
 # List of Subclassed exceptions that correspond to STATUS values and are
 # subclasses of NotmuchError.
 class OutOfMemoryError(NotmuchError):
     status = STATUS.OUT_OF_MEMORY
+
+
 class ReadOnlyDatabaseError(NotmuchError):
     status = STATUS.READ_ONLY_DATABASE
+
+
 class XapianError(NotmuchError):
     status = STATUS.XAPIAN_EXCEPTION
+
+
 class FileError(NotmuchError):
     status = STATUS.FILE_ERROR
+
+
 class FileNotEmailError(NotmuchError):
     status = STATUS.FILE_NOT_EMAIL
+
+
 class DuplicateMessageIdError(NotmuchError):
     status = STATUS.DUPLICATE_MESSAGE_ID
+
+
 class NullPointerError(NotmuchError):
     status = STATUS.NULL_POINTER
+
+
 class TagTooLongError(NotmuchError):
     status = STATUS.TAG_TOO_LONG
+
+
 class UnbalancedFreezeThawError(NotmuchError):
     status = STATUS.UNBALANCED_FREEZE_THAW
+
+
 class UnbalancedAtomicError(NotmuchError):
     status = STATUS.UNBALANCED_ATOMIC
+
+
 class NotInitializedError(NotmuchError):
     """Derived from NotmuchError, this occurs if the underlying data
     structure (e.g. database is not initialized (yet) or an iterator has
@@ -170,7 +195,6 @@ class NotInitializedError(NotmuchError):
     status = STATUS.NOT_INITIALIZED
 
 
-
 def _str(value):
     """Ensure a nicely utf-8 encoded string to pass to libnotmuch
 
@@ -187,34 +211,42 @@ class NotmuchDatabaseS(Structure):
     pass
 NotmuchDatabaseP = POINTER(NotmuchDatabaseS)
 
+
 class NotmuchQueryS(Structure):
     pass
 NotmuchQueryP = POINTER(NotmuchQueryS)
 
+
 class NotmuchThreadsS(Structure):
     pass
 NotmuchThreadsP = POINTER(NotmuchThreadsS)
 
+
 class NotmuchThreadS(Structure):
     pass
 NotmuchThreadP = POINTER(NotmuchThreadS)
 
+
 class NotmuchMessagesS(Structure):
     pass
 NotmuchMessagesP = POINTER(NotmuchMessagesS)
 
+
 class NotmuchMessageS(Structure):
     pass
 NotmuchMessageP = POINTER(NotmuchMessageS)
 
+
 class NotmuchTagsS(Structure):
     pass
 NotmuchTagsP = POINTER(NotmuchTagsS)
 
+
 class NotmuchDirectoryS(Structure):
     pass
 NotmuchDirectoryP = POINTER(NotmuchDirectoryS)
 
+
 class NotmuchFilenamesS(Structure):
     pass
 NotmuchFilenamesP = POINTER(NotmuchFilenamesS)