diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-04-14 18:59:18 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-04-14 18:59:18 (GMT) |
| commit | d48739f32d4560d21e1d8582782ce5f3941e912e (patch) | |
| tree | a2e4fe789915d81d0e48b75021689e11b8a5b564 | |
| parent | a1bda34cba2de56bd902943aae909e96d3a14b2b (diff) | |
| download | cpython-d48739f32d4560d21e1d8582782ce5f3941e912e.zip cpython-d48739f32d4560d21e1d8582782ce5f3941e912e.tar.gz cpython-d48739f32d4560d21e1d8582782ce5f3941e912e.tar.bz2 | |
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.
........
| -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 3608d1a..27a577d 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 5e4d9ba..cd28206 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -322,6 +322,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') @@ -162,6 +162,7 @@ David Cournapeau Steve Cousins Alex Coventry Matthew Dixon Cowles +Ryan Coyner Christopher A. Craig Laura Creighton Simon Cross @@ -670,6 +671,7 @@ George Sakkis Rich Salz Kevin Samborn Ilya Sandler +Mark Sapiro Ty Sarna Ben Sayer Michael Scharf @@ -312,6 +312,8 @@ C-API Library ------- +- Issue #5277: Fix quote counting when parsing RFC 2231 encoded parameters. + - Issue #7316: the acquire() method of lock objects in the :mod:`threading` module now takes an optional timeout argument in seconds. Timeout support relies on the system threading library, so as to avoid a semi-busy wait |