[Python-Dev] [Python-checkins] cpython (merge 3.2 -> default): #11062: Fix adding a message from file to Babyl mailbox (original) (raw)
Andrew Svetlov andrew.svetlov at gmail.com
Wed Aug 15 16:17:16 CEST 2012
- Previous message: [Python-Dev] Installation on Macs
- Next message: [Python-Dev] Edits to Metadata 1.2 to add extras (optional dependencies)
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Looks like it is the source of buildbot fail on Windows box.
On Wed, Aug 15, 2012 at 2:42 PM, petri.lehtinen <python-checkins at python.org> wrote:
http://hg.python.org/cpython/rev/7c8c6b905a18 changeset: 78586:7c8c6b905a18 parent: 78583:8d90fde35cc6 parent: 78585:cbc1dc8cda06 user: Petri Lehtinen <petri at digip.org> date: Wed Aug 15 14:36:14 2012 +0300 summary: #11062: Fix adding a message from file to Babyl mailbox
files: Lib/mailbox.py | 2 +- Lib/test/testmailbox.py | 18 ++++++------------ Misc/NEWS | 2 ++ 3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/Lib/mailbox.py b/Lib/mailbox.py --- a/Lib/mailbox.py +++ b/Lib/mailbox.py @@ -1440,9 +1440,9 @@ line = line[:-1] + b'\n' self.file.write(line.replace(b'\n', linesep)) if line == b'\n' or not line: - self.file.write(b'*** EOOH ***' + linesep) if firstpass: firstpass = False + self.file.write(b'*** EOOH ***' + linesep) message.seek(originalpos) else: break diff --git a/Lib/test/testmailbox.py b/Lib/test/testmailbox.py --- a/Lib/test/testmailbox.py +++ b/Lib/test/testmailbox.py @@ -152,20 +152,16 @@ f.write(bytessamplemessage) f.seek(0) key = self.box.add(f) - # See issue 11062 - if not isinstance(self.box, mailbox.Babyl): - self.assertEqual(self.box.getbytes(key).split(b'\n'), - bytessamplemessage.split(b'\n')) + self.assertEqual(self.box.getbytes(key).split(b'\n'), + bytessamplemessage.split(b'\n')) def testaddbinarynonasciifile(self): with tempfile.TemporaryFile('wb+') as f: f.write(self.nonlatinbinmsg) f.seek(0) key = self.box.add(f) - # See issue 11062 - if not isinstance(self.box, mailbox.Babyl): - self.assertEqual(self.box.getbytes(key).split(b'\n'), - self.nonlatinbinmsg.split(b'\n')) + self.assertEqual(self.box.getbytes(key).split(b'\n'), + self.nonlatinbinmsg.split(b'\n')) def testaddtextfilewarns(self): with tempfile.TemporaryFile('w+') as f: @@ -173,10 +169,8 @@ f.seek(0) with self.assertWarns(DeprecationWarning): key = self.box.add(f) - # See issue 11062 - if not isinstance(self.box, mailbox.Babyl): - self.assertEqual(self.box.getbytes(key).split(b'\n'), - bytessamplemessage.split(b'\n')) + self.assertEqual(self.box.getbytes(key).split(b'\n'), + bytessamplemessage.split(b'\n')) def testaddStringIOwarns(self): with self.assertWarns(DeprecationWarning): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,6 +13,8 @@ Library ------- +- Issue #11062: Fix adding a message from file to Babyl mailbox. + - Issue #15646: Prevent equivalent of a fork bomb when using multiprocessing on Windows without the "if name == 'main'" idiom. -- Repository URL: http://hg.python.org/cpython
Python-checkins mailing list Python-checkins at python.org http://mail.python.org/mailman/listinfo/python-checkins
-- Thanks, Andrew Svetlov
- Previous message: [Python-Dev] Installation on Macs
- Next message: [Python-Dev] Edits to Metadata 1.2 to add extras (optional dependencies)
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]