From 228d8c0528311fa0e6c7ef675530b653019946de Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Mon, 2 Jan 2012 17:07:53 +0100 Subject: [PATCH] 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/database.py | 2 +- bindings/python/notmuch/filename.py | 2 +- bindings/python/notmuch/message.py | 8 ++++---- bindings/python/notmuch/thread.py | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bindings/python/notmuch/database.py b/bindings/python/notmuch/database.py index 2eae69ed..24da8e99 100644 --- a/bindings/python/notmuch/database.py +++ b/bindings/python/notmuch/database.py @@ -935,7 +935,7 @@ class Filenames(object): file_ = Filenames._get(self._files_p) self._move_to_next(self._files_p) - return file_.decode('utf-8', errors='ignore') + return file_.decode('utf-8', 'ignore') next = __next__ # python2.x iterator protocol compatibility def __len__(self): diff --git a/bindings/python/notmuch/filename.py b/bindings/python/notmuch/filename.py index 0c2e0d52..51dae202 100644 --- a/bindings/python/notmuch/filename.py +++ b/bindings/python/notmuch/filename.py @@ -93,7 +93,7 @@ class Filenames(Python3StringMixIn): raise NotmuchError(STATUS.NOT_INITIALIZED) while self._valid(self._files): - yield Filenames._get(self._files).decode('utf-8', errors='ignore') + yield Filenames._get(self._files).decode('utf-8', 'ignore') self._move_to_next(self._files) self._files = None 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' diff --git a/bindings/python/notmuch/thread.py b/bindings/python/notmuch/thread.py index 03e472dd..e81ff1bd 100644 --- a/bindings/python/notmuch/thread.py +++ b/bindings/python/notmuch/thread.py @@ -246,7 +246,7 @@ class Thread(object): """ if self._thread is None: raise NotmuchError(STATUS.NOT_INITIALIZED) - return Thread._get_thread_id(self._thread).decode('utf-8', errors='ignore') + 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] @@ -326,7 +326,7 @@ class Thread(object): authors = Thread._get_authors(self._thread) if authors is None: return None - return authors.decode('UTF-8', errors='ignore') + return authors.decode('UTF-8', 'ignore') def get_subject(self): """Returns the Subject of 'thread' @@ -339,7 +339,7 @@ class Thread(object): subject = Thread._get_subject(self._thread) if subject is None: return None - return subject.decode('UTF-8', errors='ignore') + return subject.decode('UTF-8', 'ignore') def get_newest_date(self): """Returns time_t of the newest message date -- 2.43.0