Index: Lib/email/test/test_email_renamed.py =================================================================== --- Lib/email/test/test_email_renamed.py (revision 78650) +++ Lib/email/test/test_email_renamed.py (working copy) @@ -193,7 +193,7 @@ '\xa1This is a Quoted Printable encoded message!\n') # Subpart 3 is base64 eq(msg.get_payload(2).get_payload(decode=True), - 'This is a Base64 encoded message.') + 'This is a Base64 encoded message.\n') # Subpart 4 has no Content-Transfer-Encoding: header. eq(msg.get_payload(3).get_payload(decode=True), 'This has no Content-Transfer-Encoding: header.\n') Index: Lib/email/test/data/msg_10.txt =================================================================== --- Lib/email/test/data/msg_10.txt (revision 78650) +++ Lib/email/test/data/msg_10.txt (working copy) @@ -21,7 +21,7 @@ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: Base64 -VGhpcyBpcyBhIEJhc2U2NCBlbmNvZGVkIG1lc3NhZ2Uu +VGhpcyBpcyBhIEJhc2U2NCBlbmNvZGVkIG1lc3NhZ2UuCg== --BOUNDARY Index: Lib/email/test/test_email.py =================================================================== --- Lib/email/test/test_email.py (revision 78650) +++ Lib/email/test/test_email.py (working copy) @@ -204,7 +204,7 @@ '\xa1This is a Quoted Printable encoded message!\n') # Subpart 3 is base64 eq(msg.get_payload(2).get_payload(decode=True), - 'This is a Base64 encoded message.') + 'This is a Base64 encoded message.\n') # Subpart 4 has no Content-Transfer-Encoding: header. eq(msg.get_payload(3).get_payload(decode=True), 'This has no Content-Transfer-Encoding: header.\n') Index: Lib/email/utils.py =================================================================== --- Lib/email/utils.py (revision 78650) +++ Lib/email/utils.py (working copy) @@ -60,14 +60,9 @@ def _bdecode(s): - # We can't quite use base64.encodestring() since it tacks on a "courtesy - # newline". Blech! if not s: return s - value = base64.decodestring(s) - if not s.endswith('\n') and value.endswith('\n'): - return value[:-1] - return value + return base64.decodestring(s)