X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=bindings%2Fpython%2Fnotmuch%2Fthread.py;h=c2347fe7d856e7cf9f35598c7ebb4439bfae0f74;hb=be851ad39de11f38e1cd4f7f15f1fa952232efe2;hp=435cbe24a62e38ef8ef92880cbeffc01505dd217;hpb=2b0116119160f2dc8376a3570b23fd502328a521;p=notmuch diff --git a/bindings/python/notmuch/thread.py b/bindings/python/notmuch/thread.py index 435cbe24..c2347fe7 100644 --- a/bindings/python/notmuch/thread.py +++ b/bindings/python/notmuch/thread.py @@ -20,13 +20,13 @@ Copyright 2010 Sebastian Spaeth ' from ctypes import c_char_p, c_long, c_int 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 -class Threads(object): +class Threads(Python3StringMixIn): """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.(?) """ - if threads_p is None: + if not 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 - 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): @@ -127,6 +127,7 @@ class Threads(object): 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 @@ -140,7 +141,7 @@ class Threads(object): # 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 @@ -227,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 @@ -243,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) + 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] @@ -260,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) @@ -283,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) @@ -306,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) @@ -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. """ - 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') + return authors.decode('UTF-8', 'ignore') 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. """ - 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') + return subject.decode('UTF-8', 'ignore') 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. """ - if self._thread is None: + if not 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. """ - if self._thread is None: + if not 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 """ - if self._thread is None: + if not self._thread: raise NotmuchError(STATUS.NOT_INITIALIZED) tags_p = Thread._get_tags(self._thread) @@ -391,9 +392,6 @@ class Thread(object): raise NotmuchError(STATUS.NULL_POINTER) return Tags(tags_p, self) - def __str__(self): - return unicode(self).encode('utf-8') - def __unicode__(self): frm = "thread:%s %12s [%d/%d] %s; %s (%s)"