debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-02-17 23:53:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

py3k: Rename .next() to __next__(), add python2.x compatibility alias

Browse source
This commit is contained in:
Justus Winter 2011-12-14 11:58:22 +01:00 • committed by Sebastian Spaeth
parent 9c32ee5372
commit 26d52cf6cf
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -925,7 +925,7 @@ class Filenames(object):
_move_to_next.argtypes = [NotmuchFilenamesP] _move_to_next.argtypes = [NotmuchFilenamesP]
_move_to_next.restype = None _move_to_next.restype = None
def next(self): def __next__(self):
if self._files_p is None: if self._files_p is None:
raise NotmuchError(STATUS.NOT_INITIALIZED) raise NotmuchError(STATUS.NOT_INITIALIZED)
@ -936,6 +936,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 return file
next = __next__ # python2.x iterator protocol compatibility
def __len__(self): def __len__(self):
"""len(:class:`Filenames`) returns the number of contained files """len(:class:`Filenames`) returns the number of contained files

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

@ -158,7 +158,7 @@ class Messages(object):
_move_to_next.argtypes = [NotmuchMessagesP] _move_to_next.argtypes = [NotmuchMessagesP]
_move_to_next.restype = None _move_to_next.restype = None
def next(self): def __next__(self):
if self._msgs is None: if self._msgs is None:
raise NotmuchError(STATUS.NOT_INITIALIZED) raise NotmuchError(STATUS.NOT_INITIALIZED)
@ -169,6 +169,7 @@ class Messages(object):
msg = Message(Messages._get(self._msgs), self) msg = Message(Messages._get(self._msgs), self)
self._move_to_next(self._msgs) self._move_to_next(self._msgs)
return msg return msg
next = __next__ # python2.x iterator protocol compatibility
def __nonzero__(self): def __nonzero__(self):
""" """

3
bindings/python/notmuch/tag.py
View file

@ -89,7 +89,7 @@ class Tags(object):
_move_to_next.argtypes = [NotmuchTagsP] _move_to_next.argtypes = [NotmuchTagsP]
_move_to_next.restype = None _move_to_next.restype = None
def next(self): def __next__(self):
if self._tags is None: if self._tags is None:
raise NotmuchError(STATUS.NOT_INITIALIZED) raise NotmuchError(STATUS.NOT_INITIALIZED)
if not self._valid(self._tags): if not self._valid(self._tags):
@ -98,6 +98,7 @@ class Tags(object):
tag = Tags._get(self._tags).decode('UTF-8') tag = Tags._get(self._tags).decode('UTF-8')
self._move_to_next(self._tags) self._move_to_next(self._tags)
return tag return tag
next = __next__ # python2.x iterator protocol compatibility
def __nonzero__(self): def __nonzero__(self):
"""Implement bool(Tags) check that can be repeatedly used """Implement bool(Tags) check that can be repeatedly used

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

@ -116,7 +116,7 @@ class Threads(object):
_move_to_next.argtypes = [NotmuchThreadsP] _move_to_next.argtypes = [NotmuchThreadsP]
_move_to_next.restype = None _move_to_next.restype = None
def next(self): def __next__(self):
if self._threads is None: if self._threads is None:
raise NotmuchError(STATUS.NOT_INITIALIZED) raise NotmuchError(STATUS.NOT_INITIALIZED)
@ -127,6 +127,7 @@ class Threads(object):
thread = Thread(Threads._get(self._threads), self) thread = Thread(Threads._get(self._threads), self)
self._move_to_next(self._threads) self._move_to_next(self._threads)
return thread return thread
next = __next__ # python2.x iterator protocol compatibility
def __len__(self): def __len__(self):
"""len(:class:`Threads`) returns the number of contained Threads """len(:class:`Threads`) returns the number of contained Threads