#11062: Fix adding a message from file to Babyl mailbox
diff --git a/Lib/mailbox.py b/Lib/mailbox.py
index 6168367..3fe0ce4 100644
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -1386,9 +1386,9 @@
line = message.readline()
self._file.write(line.replace('\n', os.linesep))
if line == '\n' or line == '':
- self._file.write('*** EOOH ***' + os.linesep)
if first_pass:
first_pass = False
+ self._file.write('*** EOOH ***' + os.linesep)
message.seek(original_pos)
else:
break
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
index d479bf8..5069aac 100644
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -8,6 +8,7 @@
import re
import shutil
import StringIO
+import tempfile
from test import test_support
import unittest
import mailbox
@@ -75,6 +76,18 @@
for i in (1, 2, 3, 4):
self._check_sample(self._box[keys[i]])
+ def test_add_file(self):
+ with tempfile.TemporaryFile('w+') as f:
+ f.write(_sample_message)
+ f.seek(0)
+ key = self._box.add(f)
+ self.assertEqual(self._box.get_string(key).split('\n'),
+ _sample_message.split('\n'))
+
+ def test_add_StringIO(self):
+ key = self._box.add(StringIO.StringIO(self._template % "0"))
+ self.assertEqual(self._box.get_string(key), self._template % "0")
+
def test_remove(self):
# Remove messages using remove()
self._test_remove_or_delitem(self._box.remove)