diff options
| author | Eli Bendersky <eliben@gmail.com> | 2012-08-15 11:50:52 (GMT) |
|---|---|---|
| committer | Eli Bendersky <eliben@gmail.com> | 2012-08-15 11:50:52 (GMT) |
| commit | f748a3773fd40dd91195fc2fef2cac2f973baaf8 (patch) | |
| tree | 2f26efbb8f49897dad34d1a5f2a7020ff7419197 /Lib/test | |
| parent | 8f773493b6c27a9b6bc3a1aceac107a0f3d669c8 (diff) | |
| parent | 3d12c4317c2970d65bf30e941070017a8d1be210 (diff) | |
| download | cpython-f748a3773fd40dd91195fc2fef2cac2f973baaf8.zip cpython-f748a3773fd40dd91195fc2fef2cac2f973baaf8.tar.gz cpython-f748a3773fd40dd91195fc2fef2cac2f973baaf8.tar.bz2 | |
merge heads in 3.2 branch
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_mailbox.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py index 9f1fdad..65120f7 100644 --- a/Lib/test/test_mailbox.py +++ b/Lib/test/test_mailbox.py @@ -148,20 +148,16 @@ class TestMailbox(TestBase): 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 @@ class TestMailbox(TestBase): 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): |