traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix another unit test.

This commit is contained in:
Guido van Rossum 2007-02-12 00:22:55 +00:00
parent 8b8a543a7b
commit dde4c2ca56
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/mailbox.py
View File

@ -95,7 +95,7 @@ class Mailbox:
def keys(self): def keys(self):
"""Return a list of keys.""" """Return a list of keys."""
return list(self.keys()) return list(self.iterkeys())
def itervalues(self): def itervalues(self):
"""Return an iterator over all messages.""" """Return an iterator over all messages."""
@ -111,7 +111,7 @@ class Mailbox:
def values(self): def values(self):
"""Return a list of messages. Memory intensive.""" """Return a list of messages. Memory intensive."""
return list(self.values()) return list(self.itervalues())
def iteritems(self): def iteritems(self):
"""Return an iterator over (key, message) tuples.""" """Return an iterator over (key, message) tuples."""
@ -124,7 +124,7 @@ class Mailbox:
def items(self): def items(self):
"""Return a list of (key, message) tuples. Memory intensive.""" """Return a list of (key, message) tuples. Memory intensive."""
return list(self.items()) return list(self.iteritems())
def __contains__(self, key): def __contains__(self, key):
"""Return True if the keyed message exists, False otherwise.""" """Return True if the keyed message exists, False otherwise."""
@ -477,7 +477,7 @@ class Maildir(Mailbox):
def next(self): def next(self):
"""Return the next message in a one-time iteration.""" """Return the next message in a one-time iteration."""
if not hasattr(self, '_onetime_keys'): if not hasattr(self, '_onetime_keys'):
self._onetime_keys = self.keys() self._onetime_keys = iter(self.keys())
while True: while True:
try: try:
return self[self._onetime_keys.next()] return self[self._onetime_keys.next()]