#11062: Fix universal newline support in Babyl._install_message()
When adding a message from a binary file, \r\n was translated to
\r\r\n in the message body.
diff --git a/Lib/mailbox.py b/Lib/mailbox.py
index 73fe7d6..282c055 100644
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -1450,10 +1450,17 @@
else:
break
while True:
- buffer = message.read(4096) # Buffer size is arbitrary.
- if not buffer:
+ line = message.readline()
+ if not line:
break
- self._file.write(buffer.replace(b'\n', linesep))
+ # Universal newline support.
+ if line.endswith(b'\r\n'):
+ line = line[:-2] + linesep
+ elif line.endswith(b'\r'):
+ line = line[:-1] + linesep
+ elif line.endswith(b'\n'):
+ line = line[:-1] + linesep
+ self._file.write(line)
else:
raise TypeError('Invalid message type: %s' % type(message))
stop = self._file.tell()