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
This commit is contained in:
patrick 2011-08-12 14:23:28 +01:00 committed by Sebastian Spaeth
parent dc6b2b4382
commit ee4579ad27
2 changed files with 4 additions and 4 deletions

View file

@ -395,7 +395,7 @@ class Message(object):
header = Message._get_header(self._msg, header) header = Message._get_header(self._msg, header)
if header == None: if header == None:
raise NotmuchError(STATUS.NULL_POINTER) raise NotmuchError(STATUS.NULL_POINTER)
return header return header.decode('UTF-8')
def get_filename(self): def get_filename(self):
"""Returns the file path of the message file """Returns the file path of the message file
@ -747,7 +747,7 @@ class Message(object):
"""A message() is represented by a 1-line summary""" """A message() is represented by a 1-line summary"""
msg = {} msg = {}
msg['from'] = self.get_header('from') msg['from'] = self.get_header('from')
msg['tags'] = str(self.get_tags()) msg['tags'] = self.get_tags()
msg['date'] = date.fromtimestamp(self.get_date()) msg['date'] = date.fromtimestamp(self.get_date())
return "%(from)s (%(date)s) (%(tags)s)" % (msg) return "%(from)s (%(date)s) (%(tags)s)" % (msg)

View file

@ -292,7 +292,7 @@ class Thread(object):
""" """
if self._thread is None: if self._thread is None:
raise NotmuchError(STATUS.NOT_INITIALIZED) raise NotmuchError(STATUS.NOT_INITIALIZED)
return Thread._get_authors(self._thread) return Thread._get_authors(self._thread).decode('UTF-8')
def get_subject(self): def get_subject(self):
"""Returns the Subject of 'thread' """Returns the Subject of 'thread'
@ -302,7 +302,7 @@ class Thread(object):
""" """
if self._thread is None: if self._thread is None:
raise NotmuchError(STATUS.NOT_INITIALIZED) 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): def get_newest_date(self):
"""Returns time_t of the newest message date """Returns time_t of the newest message date