diff options
| -rw-r--r-- | Lib/email/quoprimime.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_email/test_email.py | 4 | ||||
| -rw-r--r-- | Misc/ACKS | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/Lib/email/quoprimime.py b/Lib/email/quoprimime.py index 78638d5..bc02281 100644 --- 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) diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py index 78b86b8..8757924 100644 --- 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 + 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) @@ -849,6 +849,7 @@ Alessandro Moura Pablo Mouzo Mher Movsisyan Ruslan Mstoi +Valentina Mukhamedzhanova Michael Mulich Sape Mullender Sjoerd Mullender |