From ee4579ad27b0f84650f0c211ea92e2f874df8044 Mon Sep 17 00:00:00 2001 From: patrick Date: Fri, 12 Aug 2011 14:23:28 +0100 Subject: [PATCH] decode headers from utf-8 to unicode as mail headers are stored as utf-8 in the index, it is safe to return them as unicode strings directly --- bindings/python/notmuch/message.py | 4 ++-- bindings/python/notmuch/thread.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bindings/python/notmuch/message.py b/bindings/python/notmuch/message.py index 435a05db..ae6ae1b1 100644 --- a/bindings/python/notmuch/message.py +++ b/bindings/python/notmuch/message.py @@ -395,7 +395,7 @@ class Message(object): header = Message._get_header(self._msg, header) if header == None: raise NotmuchError(STATUS.NULL_POINTER) - return header + return header.decode('UTF-8') def get_filename(self): """Returns the file path of the message file @@ -747,7 +747,7 @@ class Message(object): """A message() is represented by a 1-line summary""" msg = {} msg['from'] = self.get_header('from') - msg['tags'] = str(self.get_tags()) + msg['tags'] = self.get_tags() msg['date'] = date.fromtimestamp(self.get_date()) return "%(from)s (%(date)s) (%(tags)s)" % (msg) diff --git a/bindings/python/notmuch/thread.py b/bindings/python/notmuch/thread.py index 60f6c291..120f9258 100644 --- a/bindings/python/notmuch/thread.py +++ b/bindings/python/notmuch/thread.py @@ -292,7 +292,7 @@ class Thread(object): """ if self._thread is None: raise NotmuchError(STATUS.NOT_INITIALIZED) - return Thread._get_authors(self._thread) + return Thread._get_authors(self._thread).decode('UTF-8') def get_subject(self): """Returns the Subject of 'thread' @@ -302,7 +302,7 @@ class Thread(object): """ if self._thread is None: raise NotmuchError(STATUS.NOT_INITIALIZED) - return Thread._get_subject(self._thread) + return Thread._get_subject(self._thread).decode('UTF-8') def get_newest_date(self): """Returns time_t of the newest message date