From: Petri Lehtinen <petri@digip.org>
Date: Thu, 16 Aug 2012 04:22:15 +0000 (+0300)
Subject: #11062: Fix universal newline support in Babyl._install_message()
X-Git-Tag: v3.3.0rc1~99^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88614948c08aa583c41176d05eec5cf099c9d04d;p=thirdparty%2FPython%2Fcpython.git

#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 73fe7d648330..282c0553ce9f 100644
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -1450,10 +1450,17 @@ class Babyl(_singlefileMailbox):
                     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()