diff options
| -rw-r--r-- | Lib/email/message.py | 2 | ||||
| -rw-r--r-- | Lib/email/test/test_email.py | 8 | ||||
| -rw-r--r-- | Misc/ACKS | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
4 files changed, 13 insertions, 1 deletions
diff --git a/Lib/email/message.py b/Lib/email/message.py index d89e37e..d09ab8f 100644 --- a/Lib/email/message.py +++ b/Lib/email/message.py @@ -63,7 +63,7 @@ def _parseparam(s): while s[:1] == ';': s = s[1:] end = s.find(';') - while end > 0 and s.count('"', 0, end) % 2: + while end > 0 and (s.count('"', 0, end) - s.count('\\"', 0, end)) % 2: end = s.find(';', end + 1) if end < 0: end = len(s) diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index 27ddc7c..2ce2e8c 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -318,6 +318,14 @@ class TestMessageAPI(TestEmailBase): self.assertEqual(msg.get_param('name', unquote=False), '"Jim&&Jill"') + def test_get_param_with_quotes(self): + msg = email.message_from_string( + 'Content-Type: foo; bar*0="baz\\"foobar"; bar*1="\\"baz"') + self.assertEqual(msg.get_param('bar'), 'baz"foobar"baz') + msg = email.message_from_string( + "Content-Type: foo; bar*0=\"baz\\\"foobar\"; bar*1=\"\\\"baz\"") + self.assertEqual(msg.get_param('bar'), 'baz"foobar"baz') + def test_field_containment(self): unless = self.assertTrue msg = email.message_from_string('Header: exists') @@ -154,6 +154,7 @@ David Cournapeau Steve Cousins Alex Coventry Matthew Dixon Cowles +Ryan Coyner Christopher A. Craig Laura Creighton Simon Cross @@ -654,6 +655,7 @@ George Sakkis Rich Salz Kevin Samborn Ilya Sandler +Mark Sapiro Ty Sarna Ben Sayer Michael Scharf @@ -28,6 +28,8 @@ Core and Builtins Library ------- +- Issue #5277: Fix quote counting when parsing RFC 2231 encoded parameters. + - Issue #8383: pickle and pickletools use surrogatepass error handler when encoding unicode as utf8 to support lone surrogates and stay compatible with Python 2.x and 3.0 |