From 228d8c0528311fa0e6c7ef675530b653019946de Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Mon, 2 Jan 2012 17:07:53 +0100 Subject: python: str.decode() doesn't like kwargs in python 2.5 Recent changes introduced lots of unicodification of strings, mostly in the form of .decode('utf-8', errors='ignore'). However, python 2.5 does not like the errors keyword argument and complains. It does work when used as a simple arg though, so that's what this patch does. Signed-off-by: Sebastian Spaeth --- bindings/python/notmuch/message.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bindings/python/notmuch/message.py') diff --git a/bindings/python/notmuch/message.py b/bindings/python/notmuch/message.py index fe724a51..d40a575d 100644 --- a/bindings/python/notmuch/message.py +++ b/bindings/python/notmuch/message.py @@ -364,7 +364,7 @@ class Message(Python3StringMixIn): """ if self._msg is None: raise NotmuchError(STATUS.NOT_INITIALIZED) - return Message._get_message_id(self._msg).decode('utf-8', errors='ignore') + return Message._get_message_id(self._msg).decode('utf-8', 'ignore') def get_thread_id(self): """Returns the thread ID @@ -382,7 +382,7 @@ class Message(Python3StringMixIn): if self._msg is None: raise NotmuchError(STATUS.NOT_INITIALIZED) - return Message._get_thread_id(self._msg).decode('utf-8', errors='ignore') + return Message._get_thread_id(self._msg).decode('utf-8', 'ignore') def get_replies(self): """Gets all direct replies to this message as :class:`Messages` @@ -454,7 +454,7 @@ class Message(Python3StringMixIn): header = Message._get_header(self._msg, _str(header)) if header == None: raise NotmuchError(STATUS.NULL_POINTER) - return header.decode('UTF-8', errors='ignore') + return header.decode('UTF-8', 'ignore') def get_filename(self): """Returns the file path of the message file @@ -465,7 +465,7 @@ class Message(Python3StringMixIn): """ if self._msg is None: raise NotmuchError(STATUS.NOT_INITIALIZED) - return Message._get_filename(self._msg).decode('utf-8', errors='ignore') + return Message._get_filename(self._msg).decode('utf-8', 'ignore') def get_filenames(self): """Get all filenames for the email corresponding to 'message' -- cgit v1.2.3