diff options
author | R. David Murray <rdmurray@bitdance.com> | 2009-04-02 19:44:43 (GMT) |
---|---|---|
committer | R. David Murray <rdmurray@bitdance.com> | 2009-04-02 19:44:43 (GMT) |
commit | 548ac41079c8cf87b91aed5a812bb542b5d603e1 (patch) | |
tree | 92a177d5ae90b654a269f74a22edfddd4189d306 /Lib | |
parent | 0633d760d6db597c563429ad4fc0e92121cb32e6 (diff) | |
download | cpython-548ac41079c8cf87b91aed5a812bb542b5d603e1.zip cpython-548ac41079c8cf87b91aed5a812bb542b5d603e1.tar.gz cpython-548ac41079c8cf87b91aed5a812bb542b5d603e1.tar.bz2 |
In 3k this becomes an items() call.
Merged revisions 71046 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71046 | r.david.murray | 2009-04-02 10:05:35 -0400 (Thu, 02 Apr 2009) | 4 lines
Add missing iteritems() call to the for loop in mailbox.MH.get_message().
Fixes issue2625.
........
Diffstat (limited to 'Lib')
-rwxr-xr-x | Lib/mailbox.py | 2 | ||||
-rw-r--r-- | Lib/test/test_mailbox.py | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Lib/mailbox.py b/Lib/mailbox.py index ab915ed..909285b 100755 --- a/Lib/mailbox.py +++ b/Lib/mailbox.py @@ -907,7 +907,7 @@ class MH(Mailbox): _unlock_file(f) finally: f.close() - for name, key_list in self.get_sequences(): + for name, key_list in self.get_sequences().items(): if key in key_list: msg.add_sequence(name) return msg diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py index 1828381..28b9322 100644 --- a/Lib/test/test_mailbox.py +++ b/Lib/test/test_mailbox.py @@ -931,6 +931,12 @@ class TestMH(TestMailbox): self._box.remove(key1) self.assertEqual(self._box.get_sequences(), {'flagged':[key0]}) + def test_issue2625(self): + msg0 = mailbox.MHMessage(self._template % 0) + msg0.add_sequence('foo') + key0 = self._box.add(msg0) + refmsg0 = self._box.get_message(key0) + def test_pack(self): # Pack the contents of the mailbox msg0 = mailbox.MHMessage(self._template % 0) |