[Python-checkins] cpython (merge 3.2 -> default): Merge #9298 fix. (original) (raw)
r.david.murray python-checkins at python.org
Wed Mar 16 21:15:33 CET 2011
- Previous message: [Python-checkins] cpython (merge 3.1 -> 3.2): Merge #9298 fix.
- Next message: [Python-checkins] cpython: Include the timeout value in TimeoutExpired.
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
http://hg.python.org/cpython/rev/de2cd04e5101 changeset: 68617:de2cd04e5101 parent: 68614:8d13741a3b83 parent: 68616:c34320d9095e user: R David Murray <rdmurray at bitdance.com> date: Wed Mar 16 16:14:43 2011 -0400 summary: Merge #9298 fix.
files: Lib/email/test/test_email.py Misc/ACKS Misc/NEWS
diff --git a/Lib/email/encoders.py b/Lib/email/encoders.py --- a/Lib/email/encoders.py +++ b/Lib/email/encoders.py @@ -12,7 +12,7 @@ ] -from base64 import b64encode as _bencode +from base64 import encodebytes as _bencode from quopri import encodestring as _encodestring diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -573,9 +573,18 @@ msg['Dummy'] = 'dummy\nX-Injected-Header: test' self.assertRaises(errors.HeaderParseError, msg.as_string)
Test the email.encoders module
class TestEncoders(unittest.TestCase): + + def test_EncodersEncode_base64(self): + with openfile('PyBanner048.gif', 'rb') as fp: + bindata = fp.read() + mimed = email.mime.image.MIMEImage(bindata) + base64ed = mimed.get_payload() + # the transfer-encoded body lines should all be <=76 characters + lines = base64ed.split('\n') + self.assertLessEqual(max([ len(x) for x in lines ]), 76) + def test_encode_empty_payload(self): eq = self.assertEqual msg = Message() @@ -1141,10 +1150,11 @@ def test_body(self): eq = self.assertEqual - bytes = b'\xfa\xfb\xfc\xfd\xfe\xff' - msg = MIMEApplication(bytes) - eq(msg.get_payload(), '+vv8/f7/') - eq(msg.get_payload(decode=True), bytes) + bytesdata = b'\xfa\xfb\xfc\xfd\xfe\xff' + msg = MIMEApplication(bytesdata) + # whitespace in the cte encoded block is RFC-irrelevant. + eq(msg.get_payload().strip(), '+vv8/f7/') + eq(msg.get_payload(decode=True), bytesdata) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -227,6 +227,7 @@ Ismail Donmez Marcos Donolo Dima Dorfman +Yves Dorfsman Cesar Douady Dean Draayer Fred L. Drake, Jr. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -72,6 +72,10 @@ Library
+- Issue #9298: base64 bodies weren't being folded to line lengths less than 78,
- which was a regression relative to Python2. Unlike Python2, the last line
- of the folded body now ends with a carriage return.
- Issue #11560: shutil.unpack_archive now correctly handles the format parameter. Patch by Evan Dandrea.
-- Repository URL: http://hg.python.org/cpython
- Previous message: [Python-checkins] cpython (merge 3.1 -> 3.2): Merge #9298 fix.
- Next message: [Python-checkins] cpython: Include the timeout value in TimeoutExpired.
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]