python: more error handling fixes

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

diff --git a/bindings/python/notmuch/thread.py b/bindings/python/notmuch/thread.py
index dbd6c0ff6eadaeda734ed8a4baa8c1dca65a34c2..c2347fe7d856e7cf9f35598c7ebb4439bfae0f74 100644 (file)
--- a/bindings/python/notmuch/thread.py
+++ b/bindings/python/notmuch/thread.py
@@ -17,16 +17,16 @@ 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_char_p, c_void_p, c_long, c_int
+from ctypes import c_char_p, c_long, c_int

 from notmuch.globals import (nmlib, STATUS,
     NotmuchError, NotmuchThreadP, NotmuchThreadsP, NotmuchMessagesP,
 from notmuch.globals import (nmlib, STATUS,
     NotmuchError, NotmuchThreadP, NotmuchThreadsP, NotmuchMessagesP,

-    NotmuchTagsP,)
+    NotmuchTagsP, Python3StringMixIn)

 from notmuch.message import Messages
 from notmuch.tag import Tags
 from datetime import date
 
 
 from notmuch.message import Messages
 from notmuch.tag import Tags
 from datetime import date
 
 

-class Threads(object):
+class Threads(Python3StringMixIn):

     """Represents a list of notmuch threads
 
     This object provides an iterator over a list of notmuch threads
     """Represents a list of notmuch threads
 
     This object provides an iterator over a list of notmuch threads


@@ -97,7 +97,7 @@ class Threads(object):
         :TODO: Make the iterator work more than once and cache the tags in
                the Python object.(?)
         """
         :TODO: Make the iterator work more than once and cache the tags in
                the Python object.(?)
         """

-        if threads_p is None:
+        if not threads_p:

             raise NotmuchError(STATUS.NULL_POINTER)
 
         self._threads = threads_p
             raise NotmuchError(STATUS.NULL_POINTER)
 
         self._threads = threads_p


@@ -116,8 +116,8 @@ class Threads(object):
     _move_to_next.argtypes = [NotmuchThreadsP]
     _move_to_next.restype = None
 
     _move_to_next.argtypes = [NotmuchThreadsP]
     _move_to_next.restype = None
 

-    def next(self):
-        if self._threads is None:
+    def __next__(self):
+        if not self._threads:

             raise NotmuchError(STATUS.NOT_INITIALIZED)
 
         if not self._valid(self._threads):
             raise NotmuchError(STATUS.NOT_INITIALIZED)
 
         if not self._valid(self._threads):


@@ -127,6 +127,7 @@ class Threads(object):
         thread = Thread(Threads._get(self._threads), self)
         self._move_to_next(self._threads)
         return thread
         thread = Thread(Threads._get(self._threads), self)
         self._move_to_next(self._threads)
         return thread

+    next = __next__ # python2.x iterator protocol compatibility

 
     def __len__(self):
         """len(:class:`Threads`) returns the number of contained Threads
 
     def __len__(self):
         """len(:class:`Threads`) returns the number of contained Threads


@@ -140,7 +141,7 @@ class Threads(object):
                      # next line raises NotmuchError(STATUS.NOT_INITIALIZED)!!!
                      for thread in threads: print thread
         """
                      # next line raises NotmuchError(STATUS.NOT_INITIALIZED)!!!
                      for thread in threads: print thread
         """

-        if self._threads is None:
+        if not self._threads:

             raise NotmuchError(STATUS.NOT_INITIALIZED)
 
         i = 0
             raise NotmuchError(STATUS.NOT_INITIALIZED)
 
         i = 0


@@ -227,7 +228,7 @@ class Thread(object):
               automatically delete the parent object once all derived
               objects are dead.
         """
               automatically delete the parent object once all derived
               objects are dead.
         """

-        if thread_p is None:
+        if not thread_p:

             raise NotmuchError(STATUS.NULL_POINTER)
         self._thread = thread_p
         #keep reference to parent, so we keep it alive
             raise NotmuchError(STATUS.NULL_POINTER)
         self._thread = thread_p
         #keep reference to parent, so we keep it alive


@@ -243,9 +244,9 @@ class Thread(object):
         :exception: :exc:`NotmuchError` STATUS.NOT_INITIALIZED if the thread
                     is not initialized.
         """
         :exception: :exc:`NotmuchError` STATUS.NOT_INITIALIZED if the thread
                     is not initialized.
         """

-        if self._thread is None:
+        if not self._thread:

             raise NotmuchError(STATUS.NOT_INITIALIZED)
             raise NotmuchError(STATUS.NOT_INITIALIZED)

-        return Thread._get_thread_id(self._thread)
+        return Thread._get_thread_id(self._thread).decode('utf-8', 'ignore')

 
     _get_total_messages = nmlib.notmuch_thread_get_total_messages
     _get_total_messages.argtypes = [NotmuchThreadP]
 
     _get_total_messages = nmlib.notmuch_thread_get_total_messages
     _get_total_messages.argtypes = [NotmuchThreadP]


@@ -260,7 +261,7 @@ class Thread(object):
         :exception: :exc:`NotmuchError` STATUS.NOT_INITIALIZED if the thread
                     is not initialized.
         """
         :exception: :exc:`NotmuchError` STATUS.NOT_INITIALIZED if the thread
                     is not initialized.
         """

-        if self._thread is None:
+        if not self._thread:

             raise NotmuchError(STATUS.NOT_INITIALIZED)
         return self._get_total_messages(self._thread)
 
             raise NotmuchError(STATUS.NOT_INITIALIZED)
         return self._get_total_messages(self._thread)
 


@@ -283,12 +284,12 @@ class Thread(object):
                       * STATUS.NOT_INITIALIZED if query is not inited
                       * STATUS.NULL_POINTER if search_messages failed
         """
                       * STATUS.NOT_INITIALIZED if query is not inited
                       * STATUS.NULL_POINTER if search_messages failed
         """

-        if self._thread is None:
+        if not self._thread:

             raise NotmuchError(STATUS.NOT_INITIALIZED)
 
         msgs_p = Thread._get_toplevel_messages(self._thread)
 
             raise NotmuchError(STATUS.NOT_INITIALIZED)
 
         msgs_p = Thread._get_toplevel_messages(self._thread)
 

-        if msgs_p is None:
+        if not msgs_p:

             raise NotmuchError(STATUS.NULL_POINTER)
 
         return Messages(msgs_p, self)
             raise NotmuchError(STATUS.NULL_POINTER)
 
         return Messages(msgs_p, self)


@@ -306,7 +307,7 @@ class Thread(object):
         :exception: :exc:`NotmuchError` STATUS.NOT_INITIALIZED if the thread
                     is not initialized.
         """
         :exception: :exc:`NotmuchError` STATUS.NOT_INITIALIZED if the thread
                     is not initialized.
         """

-        if self._thread is None:
+        if not self._thread:

             raise NotmuchError(STATUS.NOT_INITIALIZED)
         return self._get_matched_messages(self._thread)
 
             raise NotmuchError(STATUS.NOT_INITIALIZED)
         return self._get_matched_messages(self._thread)
 


@@ -320,12 +321,12 @@ class Thread(object):
         The returned string belongs to 'thread' and will only be valid for
         as long as this Thread() is not deleted.
         """
         The returned string belongs to 'thread' and will only be valid for
         as long as this Thread() is not deleted.
         """

-        if self._thread is None:
+        if not self._thread:

             raise NotmuchError(STATUS.NOT_INITIALIZED)
         authors = Thread._get_authors(self._thread)
             raise NotmuchError(STATUS.NOT_INITIALIZED)
         authors = Thread._get_authors(self._thread)

-        if authors is None:
+        if not authors:

             return None
             return None

-        return authors.decode('UTF-8')
+        return authors.decode('UTF-8', 'ignore')

 
     def get_subject(self):
         """Returns the Subject of 'thread'
 
     def get_subject(self):
         """Returns the Subject of 'thread'


@@ -333,12 +334,12 @@ class Thread(object):
         The returned string belongs to 'thread' and will only be valid for
         as long as this Thread() is not deleted.
         """
         The returned string belongs to 'thread' and will only be valid for
         as long as this Thread() is not deleted.
         """

-        if self._thread is None:
+        if not self._thread:

             raise NotmuchError(STATUS.NOT_INITIALIZED)
         subject = Thread._get_subject(self._thread)
             raise NotmuchError(STATUS.NOT_INITIALIZED)
         subject = Thread._get_subject(self._thread)

-        if subject is None:
+        if not subject:

             return None
             return None

-        return subject.decode('UTF-8')
+        return subject.decode('UTF-8', 'ignore')

 
     def get_newest_date(self):
         """Returns time_t of the newest message date
 
     def get_newest_date(self):
         """Returns time_t of the newest message date


@@ -348,7 +349,7 @@ class Thread(object):
         :exception: :exc:`NotmuchError` STATUS.NOT_INITIALIZED if the message
                     is not initialized.
         """
         :exception: :exc:`NotmuchError` STATUS.NOT_INITIALIZED if the message
                     is not initialized.
         """

-        if self._thread is None:
+        if not self._thread:

             raise NotmuchError(STATUS.NOT_INITIALIZED)
         return Thread._get_newest_date(self._thread)
 
             raise NotmuchError(STATUS.NOT_INITIALIZED)
         return Thread._get_newest_date(self._thread)
 


@@ -360,7 +361,7 @@ class Thread(object):
         :exception: :exc:`NotmuchError` STATUS.NOT_INITIALIZED if the message
                     is not initialized.
         """
         :exception: :exc:`NotmuchError` STATUS.NOT_INITIALIZED if the message
                     is not initialized.
         """

-        if self._thread is None:
+        if not self._thread:

             raise NotmuchError(STATUS.NOT_INITIALIZED)
         return Thread._get_oldest_date(self._thread)
 
             raise NotmuchError(STATUS.NOT_INITIALIZED)
         return Thread._get_oldest_date(self._thread)
 


@@ -383,7 +384,7 @@ class Thread(object):
                         is not initialized.
                       * STATUS.NULL_POINTER, on error
         """
                         is not initialized.
                       * STATUS.NULL_POINTER, on error
         """

-        if self._thread is None:
+        if not self._thread:

             raise NotmuchError(STATUS.NOT_INITIALIZED)
 
         tags_p = Thread._get_tags(self._thread)
             raise NotmuchError(STATUS.NOT_INITIALIZED)
 
         tags_p = Thread._get_tags(self._thread)


@@ -391,31 +392,17 @@ class Thread(object):
             raise NotmuchError(STATUS.NULL_POINTER)
         return Tags(tags_p, self)
 
             raise NotmuchError(STATUS.NULL_POINTER)
         return Tags(tags_p, self)
 

-    def __str__(self):
-        """A str(Thread()) is represented by a 1-line summary"""
-        thread = {}
-        thread['id'] = self.get_thread_id()
-
-        ###TODO: How do we find out the current sort order of Threads?
-        ###Add a "sort" attribute to the Threads() object?
-        #if (sort == NOTMUCH_SORT_OLDEST_FIRST)
-        #         date = notmuch_thread_get_oldest_date (thread);
-        #else
-        #         date = notmuch_thread_get_newest_date (thread);
-        thread['date'] = date.fromtimestamp(self.get_newest_date())
-        thread['matched'] = self.get_matched_messages()
-        thread['total'] = self.get_total_messages()
-        thread['authors'] = self.get_authors()
-        thread['subject'] = self.get_subject()
-        thread['tags'] = self.get_tags()
-
-        return "thread:%s %12s [%d/%d] %s; %s (%s)" % (thread['id'],
-                                                       thread['date'],
-                                                       thread['matched'],
-                                                       thread['total'],
-                                                       thread['authors'],
-                                                       thread['subject'],
-                                                       thread['tags'])
+    def __unicode__(self):
+        frm = "thread:%s %12s [%d/%d] %s; %s (%s)"
+
+        return frm % (self.get_thread_id(),
+                      date.fromtimestamp(self.get_newest_date()),
+                      self.get_matched_messages(),
+                      self.get_total_messages(),
+                      self.get_authors(),
+                      self.get_subject(),
+                      self.get_tags(),
+                     )

 
     _destroy = nmlib.notmuch_thread_destroy
     _destroy.argtypes = [NotmuchThreadP]
 
     _destroy = nmlib.notmuch_thread_destroy
     _destroy.argtypes = [NotmuchThreadP]