diff options
Diffstat (limited to 'Lib/email')
| -rw-r--r-- | Lib/email/message.py | 2 | ||||
| -rw-r--r-- | Lib/email/test/test_email.py | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Lib/email/message.py b/Lib/email/message.py index db09dee..26dacf4 100644 --- a/Lib/email/message.py +++ b/Lib/email/message.py @@ -62,7 +62,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 d66519e..7c15a7c 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -338,6 +338,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_has_key(self): msg = email.message_from_string('Header: exists') self.failUnless(msg.has_key('header')) |