(original) (raw)

changeset: 68877:d9a779be9736 parent: 68874:d8dd7ab6039d parent: 68876:df613f7b726a user: R David Murray rdmurray@bitdance.com date: Wed Mar 23 15:37:26 2011 -0400 files: Lib/test/test_email/test_email.py description: Merge #11590: fix quoprimime decode handling of empty strings and line endings. diff -r d8dd7ab6039d -r d9a779be9736 Lib/email/quoprimime.py --- a/Lib/email/quoprimime.py Wed Mar 23 20:17:45 2011 +0100 +++ b/Lib/email/quoprimime.py Wed Mar 23 15:37:26 2011 -0400 @@ -135,9 +135,9 @@ charset names the character set to use in the RFC 2046 header. It defaults to iso-8859-1. """ - # Return empty headers unchanged + # Return empty headers as an empty string. if not header_bytes: - return str(header_bytes) + return '' # Iterate over every byte, encoding if necessary. encoded = [] for octet in header_bytes: @@ -268,7 +268,7 @@ if i == n: decoded += eol # Special case if original string did not end with eol - if not encoded.endswith(eol) and decoded.endswith(eol): + if encoded[-1] not in '\r\n' and decoded.endswith(eol): decoded = decoded[:-1] return decoded diff -r d8dd7ab6039d -r d9a779be9736 Lib/test/test_email/test_email.py --- a/Lib/test/test_email/test_email.py Wed Mar 23 20:17:45 2011 +0100 +++ b/Lib/test/test_email/test_email.py Wed Mar 23 15:37:26 2011 -0400 @@ -3351,6 +3351,9 @@ encoded_header = quoprimime.header_encode(header, charset) self.assertEqual(encoded_header, expected_encoded_header) + def test_header_encode_null(self): + self._test_header_encode(b'', '') + def test_header_encode_one_word(self): self._test_header_encode(b'hello', '=?iso-8859-1?q?hello?=') @@ -3407,6 +3410,15 @@ def test_decode_one_line_lf(self): self._test_decode('hello\n', 'hello\n') + def test_decode_one_line_cr(self): + self._test_decode('hello\r', 'hello\n') + + def test_decode_one_line_nl(self): + self._test_decode('hello\n', 'helloX', eol='X') + + def test_decode_one_line_crnl(self): + self._test_decode('hello\r\n', 'helloX', eol='X') + def test_decode_one_line_one_word(self): self._test_decode('hello\r\nworld', 'hello\nworld') @@ -3416,6 +3428,9 @@ def test_decode_two_lines(self): self._test_decode('hello\r\nworld\r\n', 'hello\nworld\n') + def test_decode_two_lines_eol(self): + self._test_decode('hello\r\nworld\r\n', 'helloXworldX', eol='X') + def test_decode_one_long_line(self): self._test_decode('Spam' * 250, 'Spam' * 250) /rdmurray@bitdance.com