debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-01-20 18:25:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

python: str.decode() doesn't like kwargs in python 2.5

Browse source 
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 <Sebastian@SSpaeth.de>
This commit is contained in:
Sebastian Spaeth 2012-01-02 17:07:53 +01:00
parent ada246aa20
commit 228d8c0528
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bindings/python/notmuch/database.py
View file

@ -935,7 +935,7 @@ class Filenames(object):
file_ = Filenames._get(self._files_p) file_ = Filenames._get(self._files_p)
self._move_to_next(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 next = __next__ # python2.x iterator protocol compatibility
def __len__(self): def __len__(self):

2
bindings/python/notmuch/filename.py
View file

@ -93,7 +93,7 @@ class Filenames(Python3StringMixIn):
raise NotmuchError(STATUS.NOT_INITIALIZED) raise NotmuchError(STATUS.NOT_INITIALIZED)
while self._valid(self._files): 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._move_to_next(self._files)
self._files = None self._files = None

8
bindings/python/notmuch/message.py
View file

@ -364,7 +364,7 @@ class Message(Python3StringMixIn):
""" """
if self._msg is None: if self._msg is None:
raise NotmuchError(STATUS.NOT_INITIALIZED) 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): def get_thread_id(self):
"""Returns the thread ID """Returns the thread ID
@ -382,7 +382,7 @@ class Message(Python3StringMixIn):
if self._msg is None: if self._msg is None:
raise NotmuchError(STATUS.NOT_INITIALIZED) 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): def get_replies(self):
"""Gets all direct replies to this message as :class:`Messages` """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)) header = Message._get_header(self._msg, _str(header))
if header == None: if header == None:
raise NotmuchError(STATUS.NULL_POINTER) raise NotmuchError(STATUS.NULL_POINTER)
return header.decode('UTF-8', errors='ignore') return header.decode('UTF-8', 'ignore')
def get_filename(self): def get_filename(self):
"""Returns the file path of the message file """Returns the file path of the message file
@ -465,7 +465,7 @@ class Message(Python3StringMixIn):
""" """
if self._msg is None: if self._msg is None:
raise NotmuchError(STATUS.NOT_INITIALIZED) 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): def get_filenames(self):
"""Get all filenames for the email corresponding to 'message' """Get all filenames for the email corresponding to 'message'

6
bindings/python/notmuch/thread.py
View file

@ -246,7 +246,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_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 = nmlib.notmuch_thread_get_total_messages
_get_total_messages.argtypes = [NotmuchThreadP] _get_total_messages.argtypes = [NotmuchThreadP]
@ -326,7 +326,7 @@ class Thread(object):
authors = Thread._get_authors(self._thread) authors = Thread._get_authors(self._thread)
if authors is None: if authors is None:
return None return None
return authors.decode('UTF-8', errors='ignore') return authors.decode('UTF-8', 'ignore')
def get_subject(self): def get_subject(self):
"""Returns the Subject of 'thread' """Returns the Subject of 'thread'
@ -339,7 +339,7 @@ class Thread(object):
subject = Thread._get_subject(self._thread) subject = Thread._get_subject(self._thread)
if subject is None: if subject is None:
return None return None
return subject.decode('UTF-8', errors='ignore') return subject.decode('UTF-8', 'ignore')
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