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 03e472ddc8984ae98abf8d92a077c37c5fe481db..c2347fe7d856e7cf9f35598c7ebb4439bfae0f74 100644 (file)
--- a/bindings/python/notmuch/thread.py
+++ b/bindings/python/notmuch/thread.py
@@ -97,7 +97,7 @@ class Threads(Python3StringMixIn):
         :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
@@ -117,7 +117,7 @@ class Threads(Python3StringMixIn):
     _move_to_next.restype = None
 
     def __next__(self):
-        if self._threads is None:
+        if not self._threads:
             raise NotmuchError(STATUS.NOT_INITIALIZED)
 
         if not self._valid(self._threads):
@@ -141,7 +141,7 @@ class Threads(Python3StringMixIn):
                      # 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
@@ -228,7 +228,7 @@ class Thread(object):
               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
@@ -244,9 +244,9 @@ class Thread(object):
         :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 Thread._get_thread_id(self._thread).decode('utf-8', errors='ignore')
+        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]
@@ -261,7 +261,7 @@ class Thread(object):
         :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)
 
@@ -284,12 +284,12 @@ class Thread(object):
                       * 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)
 
-        if msgs_p is None:
+        if not msgs_p:
             raise NotmuchError(STATUS.NULL_POINTER)
 
         return Messages(msgs_p, self)
@@ -307,7 +307,7 @@ class Thread(object):
         :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)
 
@@ -321,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.
         """
-        if self._thread is None:
+        if not self._thread:
             raise NotmuchError(STATUS.NOT_INITIALIZED)
         authors = Thread._get_authors(self._thread)
-        if authors is None:
+        if not authors:
             return None
-        return authors.decode('UTF-8', errors='ignore')
+        return authors.decode('UTF-8', 'ignore')
 
     def get_subject(self):
         """Returns the Subject of 'thread'
@@ -334,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.
         """
-        if self._thread is None:
+        if not self._thread:
             raise NotmuchError(STATUS.NOT_INITIALIZED)
         subject = Thread._get_subject(self._thread)
-        if subject is None:
+        if not subject:
             return None
-        return subject.decode('UTF-8', errors='ignore')
+        return subject.decode('UTF-8', 'ignore')
 
     def get_newest_date(self):
         """Returns time_t of the newest message date
@@ -349,7 +349,7 @@ class Thread(object):
         :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)
 
@@ -361,7 +361,7 @@ class Thread(object):
         :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)
 
@@ -384,7 +384,7 @@ class Thread(object):
                         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)