diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-03-08 02:17:03 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-03-08 02:17:03 (GMT) |
| commit | 57a4b983a66ec5cd9b5af37cb6095cfc188f053a (patch) | |
| tree | e3b8475393a872ec86c66a572842a0b8746df89a /Lib/email/message.py | |
| parent | ae5f2f4a39e6a3f4c45e9dc95bd4e1fe5dfb60f2 (diff) | |
| download | cpython-57a4b983a66ec5cd9b5af37cb6095cfc188f053a.zip cpython-57a4b983a66ec5cd9b5af37cb6095cfc188f053a.tar.gz cpython-57a4b983a66ec5cd9b5af37cb6095cfc188f053a.tar.bz2 | |
bdecode was already gone in email 5. This merge adds the test from
the trunk patch, and removes the last trace of bdecode, which was
a commented out call in message.py.
Merged revisions 78778 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78778 | r.david.murray | 2010-03-07 21:04:06 -0500 (Sun, 07 Mar 2010) | 9 lines
Issue #7143: get_payload used to strip any trailing newline from a
base64 transfer-encoded payload *after* decoding it; it no longer does.
email had a special method in utils, _bdecode, specifically to do this,
so it must have served a purpose at some point, yet it is clearly wrong
per RFC. Fixed with Barry's approval, but no backport. Email package
minor version number is bumped, now version 4.0.1.
Patch by Joaquin Cuenca Abela.
........
Diffstat (limited to 'Lib/email/message.py')
| -rw-r--r-- | Lib/email/message.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Lib/email/message.py b/Lib/email/message.py index d89e37e..3608d1a 100644 --- a/Lib/email/message.py +++ b/Lib/email/message.py @@ -204,7 +204,6 @@ class Message: if isinstance(payload, str): payload = payload.encode('raw-unicode-escape') return base64.b64decode(payload) - #return utils._bdecode(payload) except binascii.Error: # Incorrect padding pass |