summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_mailbox.py
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2012-08-15 11:00:40 (GMT)
committerPetri Lehtinen <petri@digip.org>2012-08-15 11:26:27 (GMT)
commit3d12c4317c2970d65bf30e941070017a8d1be210 (patch)
tree418a655a5f37bc1559f0f101c88f88cadd7b9d9b /Lib/test/test_mailbox.py
parent2b209cd78d5a36d63b00d0a4350b78aec7bc820b (diff)
downloadcpython-3d12c4317c2970d65bf30e941070017a8d1be210.zip
cpython-3d12c4317c2970d65bf30e941070017a8d1be210.tar.gz
cpython-3d12c4317c2970d65bf30e941070017a8d1be210.tar.bz2
#11062: Fix adding a message from file to Babyl mailbox
Diffstat (limited to 'Lib/test/test_mailbox.py')
-rw-r--r--Lib/test/test_mailbox.py18
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):