From: R. David Murray Date: Thu, 2 Apr 2009 19:44:43 +0000 (+0000) Subject: In 3k this becomes an items() call. X-Git-Tag: v3.1a2~63 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=548ac41079c8cf87b91aed5a812bb542b5d603e1;p=python 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. ........ --- diff --git a/Lib/mailbox.py b/Lib/mailbox.py index ab915edea7..909285bd98 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 182838118d..28b9322169 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) diff --git a/Misc/NEWS b/Misc/NEWS index c7b203dd88..465c9d0abe 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -58,6 +58,9 @@ Core and Builtins Library ------- +- Issue 2625: added missing items() call to the for loop in + mailbox.MH.get_message(). + - Issue #5640: Fix _multibytecodec so that CJK codecs don't repeat error substitutions from non-strict codec error callbacks in incrementalencoder and StreamWriter.