From 84ee3103a3d0fd5a56a8d33ddacacafe858d0e1c Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Wed, 14 Apr 2010 19:05:38 +0000 Subject: [PATCH] Merged revisions 80078 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80078 | r.david.murray | 2010-04-14 14:59:18 -0400 (Wed, 14 Apr 2010) | 9 lines Merged revisions 80062 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80062 | r.david.murray | 2010-04-13 16:57:40 -0400 (Tue, 13 Apr 2010) | 2 lines Issue #5277: Fix quote counting when parsing RFC 2231 encoded parameters. ........ ................ --- Lib/email/message.py | 2 +- Lib/email/test/test_email.py | 8 ++++++++ Misc/ACKS | 2 ++ Misc/NEWS | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Lib/email/message.py b/Lib/email/message.py index d89e37e0b61..d09ab8fd13d 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 27ddc7c58aa..2ce2e8c1a7c 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') diff --git a/Misc/ACKS b/Misc/ACKS index 3638cc0adc9..410158aa409 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -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 diff --git a/Misc/NEWS b/Misc/NEWS index d72ce12aaf9..536ea43ed5a 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -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