From 8b2af27dae7c80218c9912052ac1b4c6144ce746 Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Fri, 31 Aug 2007 03:04:26 +0000 Subject: More email package fixes. MIMEApplication() requires a bytes object for its _data, so fix the tests. We no longer need utils._identity() or utils._bdecode(). The former isn't used anywhere AFAICT (where's "make test's" lint? ) and the latter is a kludge that is eliminated by base64.b64encode(). Current status: 5F/5E --- Lib/email/encoders.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'Lib/email/encoders.py') diff --git a/Lib/email/encoders.py b/Lib/email/encoders.py index 06016cdea7c..2e77e619e1d 100644 --- a/Lib/email/encoders.py +++ b/Lib/email/encoders.py @@ -11,8 +11,8 @@ __all__ = [ 'encode_quopri', ] -import base64 +from base64 import b64encode as _bencode from quopri import encodestring as _encodestring @@ -23,19 +23,6 @@ def _qencode(s): return enc.replace(' ', '=20') -def _bencode(s): - # We can't quite use base64.encodestring() since it tacks on a "courtesy - # newline". Blech! - if not s: - return s - hasnewline = (s[-1] == '\n') - value = base64.encodestring(s) - if not hasnewline and value[-1] == '\n': - return value[:-1] - return value - - - def encode_base64(msg): """Encode the message's payload in Base64. -- cgit v1.2.3