Skip to content

Commit dd66fb0

Browse files
[3.15] gh-157880: Write visible headers of BabylMessage in mailbox.Babyl (GH-157881) (GH-160276)
(cherry picked from commit 1512f78) Co-authored-by: Vasiliy Kiryanov <vasiliy.kiryanov@gmail.com>
1 parent cc18279 commit dd66fb0

3 files changed

Lines changed: 28 additions & 0 deletions

File tree

‎Lib/mailbox.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1495,6 +1495,7 @@ def _install_message(self, message):
14951495
vis_buffer = io.BytesIO()
14961496
vis_generator = email.generator.BytesGenerator(vis_buffer, False, 0)
14971497
vis_generator.flatten(message.get_visible())
1498+
vis_buffer.seek(0)
14981499
while True:
14991500
line = vis_buffer.readline()
15001501
self._file.write(line.replace(b'\n', linesep))

‎Lib/test/test_mailbox.py‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,6 +1521,31 @@ def test_labels(self):
15211521
self._box.remove(key1)
15221522
self.assertEqual(set(self._box.get_labels()), set(['blah']))
15231523

1524+
def test_visible_headers(self):
1525+
# gh-157880: visible headers are written to the file and read back
1526+
msg = mailbox.BabylMessage(self._template % 0)
1527+
msg.update_visible()
1528+
key = self._box.add(msg)
1529+
for retrieved in (self._box.get_message(key), self._box[key]):
1530+
self.assertEqual(retrieved['from'], 'foo')
1531+
self.assertEqual(retrieved.get_payload(), '0\n')
1532+
self.assertEqual(retrieved.get_visible().keys(), ['From'])
1533+
self.assertEqual(retrieved.get_visible()['from'], 'foo')
1534+
self.assertEqual(self._box.get_bytes(key),
1535+
(self._template % 0).encode('ascii'))
1536+
1537+
def test_no_visible_headers(self):
1538+
# gh-157880: empty visible headers are written to the file
1539+
# and read back
1540+
msg = mailbox.BabylMessage(self._template % 0)
1541+
key = self._box.add(msg)
1542+
for retrieved in (self._box.get_message(key), self._box[key]):
1543+
self.assertEqual(retrieved['from'], 'foo')
1544+
self.assertEqual(retrieved.get_payload(), '0\n')
1545+
self.assertEqual(retrieved.get_visible().keys(), [])
1546+
self.assertEqual(self._box.get_bytes(key),
1547+
(self._template % 0).encode('ascii'))
1548+
15241549

15251550
class FakeFileLikeObject:
15261551

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix :class:`mailbox.Babyl` to write the visible headers of a
2+
:class:`mailbox.BabylMessage` to the mailbox file.

0 commit comments

Comments
 (0)