cpython: 6e23ce14c3c6 (original) (raw)

Mercurial > cpython

changeset 84463:6e23ce14c3c6

#18380: merge with 3.3. [#18380]

Ezio Melotti ezio.melotti@gmail.com
date	Sat, 06 Jul 2013 17:17:45 +0200
parents	dbd301063e59(current diff)c8fd1351c840(diff)
children	0d590683c8d1
files	Misc/ACKS
diffstat	3 files changed, 6 insertions(+), 1 deletions(-)[+] [-] Lib/email/quoprimime.py 2 Lib/test/test_email/test_email.py 4 Misc/ACKS 1

line wrap: on

line diff

--- a/Lib/email/quoprimime.py +++ b/Lib/email/quoprimime.py @@ -319,4 +319,4 @@ def header_decode(s): the high level email.header class for that functionality. """ s = s.replace('_', ' ')

return re.sub(r'=[a-fA-F0-9]{2}', _unquote_match, s, re.ASCII)

return re.sub(r'=[a-fA-F0-9]{2}', _unquote_match, s, flags=re.ASCII)

--- a/Lib/test/test_email/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -4048,6 +4048,10 @@ class TestQuopri(unittest.TestCase): def test_header_decode_non_ascii(self): self._test_header_decode('hello=C7there', 'hello\xc7there')

def test_header_decode_re_bug_18380(self):

   # Issue 18380: Call re.sub with a positional argument for flags in the wrong position[](#l2.8)

   self.assertEqual(quoprimime.header_decode('=30' * 257), '0' * 257)[](#l2.9)

+ def _test_decode(self, encoded, expected_decoded, eol=None): if eol is None: decoded = quoprimime.decode(encoded)

--- a/Misc/ACKS +++ b/Misc/ACKS @@ -871,6 +871,7 @@ Alessandro Moura Pablo Mouzo Mher Movsisyan Ruslan Mstoi +Valentina Mukhamedzhanova Michael Mulich Sape Mullender Sjoerd Mullender