]> git.cworth.org Git - notmuch-old/commitdiff
decode headers from utf-8 to unicode
authorpatrick <p.totzke@ed.ac.uk>
Fri, 12 Aug 2011 13:23:28 +0000 (14:23 +0100)
committerSebastian Spaeth <Sebastian@SSpaeth.de>
Mon, 15 Aug 2011 13:48:50 +0000 (15:48 +0200)
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
bindings/python/notmuch/thread.py

index 435a05db3400225fa143c60b9ab9919c9a0f30ac..ae6ae1b1805dde71194e497aea97f49d4a21d647 100644 (file)
@@ -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)
 
index 60f6c291c28242ef1b445ea17c711a9bf09a4ac7..120f9258667494b1f36a30e03ff32313bb14375e 100644 (file)
@@ -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