[Python-checkins] r71067 - in python/branches/py3k: Lib/mailbox.py Lib/test/test_mailbox.py Misc/NEWS

[r.david.murray]

Author: r.david.murray
Date: Thu Apr  2 21:44:43 2009
New Revision: 71067

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/mailbox.py
   python/branches/py3k/Lib/test/test_mailbox.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Lib/mailbox.py
==============================================================================
--- python/branches/py3k/Lib/mailbox.py	(original)
+++ python/branches/py3k/Lib/mailbox.py	Thu Apr  2 21:44:43 2009
@@ -907,7 +907,7 @@
                     _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

Modified: python/branches/py3k/Lib/test/test_mailbox.py
==============================================================================
--- python/branches/py3k/Lib/test/test_mailbox.py	(original)
+++ python/branches/py3k/Lib/test/test_mailbox.py	Thu Apr  2 21:44:43 2009
@@ -931,6 +931,12 @@
         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)

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Thu Apr  2 21:44:43 2009
@@ -58,6 +58,9 @@
 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.