(original) (raw)

changeset: 84463:6e23ce14c3c6 parent: 84461:dbd301063e59 parent: 84462:c8fd1351c840 user: Ezio Melotti ezio.melotti@gmail.com date: Sat Jul 06 17:17:45 2013 +0200 files: Misc/ACKS description: #18380: merge with 3.3. diff -r dbd301063e59 -r 6e23ce14c3c6 Lib/email/quoprimime.py --- a/Lib/email/quoprimime.py Sat Jul 06 15:08:29 2013 +0200 +++ b/Lib/email/quoprimime.py Sat Jul 06 17:17:45 2013 +0200 @@ -319,4 +319,4 @@ 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) diff -r dbd301063e59 -r 6e23ce14c3c6 Lib/test/test_email/test_email.py --- a/Lib/test/test_email/test_email.py Sat Jul 06 15:08:29 2013 +0200 +++ b/Lib/test/test_email/test_email.py Sat Jul 06 17:17:45 2013 +0200 @@ -4048,6 +4048,10 @@ 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 + self.assertEqual(quoprimime.header_decode('=30' * 257), '0' * 257) + def _test_decode(self, encoded, expected_decoded, eol=None): if eol is None: decoded = quoprimime.decode(encoded) diff -r dbd301063e59 -r 6e23ce14c3c6 Misc/ACKS --- a/Misc/ACKS Sat Jul 06 15:08:29 2013 +0200 +++ b/Misc/ACKS Sat Jul 06 17:17:45 2013 +0200 @@ -871,6 +871,7 @@ Pablo Mouzo Mher Movsisyan Ruslan Mstoi +Valentina Mukhamedzhanova Michael Mulich Sape Mullender Sjoerd Mullender /ezio.melotti@gmail.com