[Python-checkins] r71068 - in python/branches/release30-maint: Lib/mailbox.py Lib/test/test_mailbox.py Misc/NEWS

Thu Apr 2 22:22:30 CEST 2009

Author: r.david.murray
Date: Thu Apr 2 22:22:29 2009
New Revision: 71068
Log:
Actually this was merged by hand because svnmerge messed up the properties
on the merge of revision 71067 presumably as a result of my immediately
previous fix for Brett's fix for his fix....
Merged revisions 71067 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
 r71067 | r.david.murray | 2009年04月02日 15:44:43 -0400 (2009年4月02日) | 13 lines
 
 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 (2009年4月02日) | 4 lines
 
 Add missing iteritems() call to the for loop in mailbox.MH.get_message().
 
 Fixes issue2625.
 ........
................
Modified:
 python/branches/release30-maint/Lib/mailbox.py
 python/branches/release30-maint/Lib/test/test_mailbox.py
 python/branches/release30-maint/Misc/NEWS
Modified: python/branches/release30-maint/Lib/mailbox.py
==============================================================================

--- python/branches/release30-maint/Lib/mailbox.py	(original)
+++ python/branches/release30-maint/Lib/mailbox.py	Thu Apr 2 22:22:29 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/release30-maint/Lib/test/test_mailbox.py
==============================================================================
--- python/branches/release30-maint/Lib/test/test_mailbox.py	(original)
+++ python/branches/release30-maint/Lib/test/test_mailbox.py	Thu Apr 2 22:22:29 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/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Thu Apr 2 22:22:29 2009
@@ -30,6 +30,9 @@
 Library
 -------
 
+- Issue 2625: added missing items() call to the for loop in
+ mailbox.MH.get_message().
+
 - Issue #5619: Multiprocessing children disobey the debug flag and causes
 popups on windows buildbots. Patch applied to work around this issue.
 
