diff options
Diffstat (limited to 'Lib')
| -rwxr-xr-x | Lib/mailbox.py | 13 | ||||
| -rw-r--r-- | Lib/test/test_mailbox.py | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/Lib/mailbox.py b/Lib/mailbox.py index 85e3ab1..d9c289b 100755 --- a/Lib/mailbox.py +++ b/Lib/mailbox.py @@ -234,6 +234,9 @@ class Maildir(Mailbox): raise NoSuchMailboxError(self._path) self._toc = {} self._last_read = None # Records last time we read cur/new + # NOTE: we manually invalidate _last_read each time we do any + # modifications ourselves, otherwise we might get tripped up by + # bogus mtime behaviour on some systems (see issue #6896). def add(self, message): """Add message and return assigned key.""" @@ -267,11 +270,15 @@ class Maildir(Mailbox): raise if isinstance(message, MaildirMessage): os.utime(dest, (os.path.getatime(dest), message.get_date())) + # Invalidate cached toc + self._last_read = None return uniq def remove(self, key): """Remove the keyed message; raise KeyError if it doesn't exist.""" os.remove(os.path.join(self._path, self._lookup(key))) + # Invalidate cached toc (only on success) + self._last_read = None def discard(self, key): """If the keyed message exists, remove it.""" @@ -306,6 +313,8 @@ class Maildir(Mailbox): if isinstance(message, MaildirMessage): os.utime(new_path, (os.path.getatime(new_path), message.get_date())) + # Invalidate cached toc + self._last_read = None def get_message(self, key): """Return a Message representation or raise a KeyError.""" @@ -360,7 +369,9 @@ class Maildir(Mailbox): def flush(self): """Write any pending changes to disk.""" - return # Maildir changes are always written immediately. + # Maildir changes are always written immediately, so there's nothing + # to do except invalidate our cached toc. + self._last_read = None def lock(self): """Lock the mailbox.""" diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py index 66472d9..9a43f88 100644 --- a/Lib/test/test_mailbox.py +++ b/Lib/test/test_mailbox.py @@ -673,6 +673,9 @@ class TestMaildir(TestMailbox): self.assertEqual(self._box._lookup(key0), os.path.join('new', key0)) os.remove(os.path.join(self._path, 'new', key0)) self.assertEqual(self._box._toc, {key0: os.path.join('new', key0)}) + # Be sure that the TOC is read back from disk (see issue #6896 + # about bad mtime behaviour on some systems). + self._box.flush() self.assertRaises(KeyError, lambda: self._box._lookup(key0)) self.assertEqual(self._box._toc, {}) |