(original) (raw)

changeset: 78585:cbc1dc8cda06 branch: 3.2 parent: 78580:7590dec388a7 user: Petri Lehtinen petri@digip.org date: Wed Aug 15 14:00:40 2012 +0300 files: Lib/mailbox.py Lib/test/test_mailbox.py Misc/NEWS description: #11062: Fix adding a message from file to Babyl mailbox diff -r 7590dec388a7 -r cbc1dc8cda06 Lib/mailbox.py --- a/Lib/mailbox.py Tue Aug 14 21:40:13 2012 -0400 +++ b/Lib/mailbox.py Wed Aug 15 14:00:40 2012 +0300 @@ -1443,9 +1443,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 first_pass: first_pass = False + self._file.write(b'*** EOOH ***' + linesep) message.seek(original_pos) else: break diff -r 7590dec388a7 -r cbc1dc8cda06 Lib/test/test_mailbox.py --- a/Lib/test/test_mailbox.py Tue Aug 14 21:40:13 2012 -0400 +++ b/Lib/test/test_mailbox.py Wed Aug 15 14:00:40 2012 +0300 @@ -148,20 +148,16 @@ f.write(_bytes_sample_message) f.seek(0) key = self._box.add(f) - # See issue 11062 - if not isinstance(self._box, mailbox.Babyl): - self.assertEqual(self._box.get_bytes(key).split(b'\n'), - _bytes_sample_message.split(b'\n')) + self.assertEqual(self._box.get_bytes(key).split(b'\n'), + _bytes_sample_message.split(b'\n')) def test_add_binary_nonascii_file(self): with tempfile.TemporaryFile('wb+') as f: f.write(self._non_latin_bin_msg) f.seek(0) key = self._box.add(f) - # See issue 11062 - if not isinstance(self._box, mailbox.Babyl): - self.assertEqual(self._box.get_bytes(key).split(b'\n'), - self._non_latin_bin_msg.split(b'\n')) + self.assertEqual(self._box.get_bytes(key).split(b'\n'), + self._non_latin_bin_msg.split(b'\n')) def test_add_text_file_warns(self): with tempfile.TemporaryFile('w+') as f: @@ -169,10 +165,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.get_bytes(key).split(b'\n'), - _bytes_sample_message.split(b'\n')) + self.assertEqual(self._box.get_bytes(key).split(b'\n'), + _bytes_sample_message.split(b'\n')) def test_add_StringIO_warns(self): with self.assertWarns(DeprecationWarning): diff -r 7590dec388a7 -r cbc1dc8cda06 Misc/NEWS --- a/Misc/NEWS Tue Aug 14 21:40:13 2012 -0400 +++ b/Misc/NEWS Wed Aug 15 14:00:40 2012 +0300 @@ -101,6 +101,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. /petri@digip.org