diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-04-13 21:05:24 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-04-13 21:05:24 (GMT) |
| commit | 58a7f75d054fe5e2306a704fc8257b4cf6f99faf (patch) | |
| tree | 949ba2105590fae7ed19cd164329dde68c6f3155 /Lib | |
| parent | 6aca57e757bc385f648a81618596bebbb1ce39f1 (diff) | |
| download | cpython-58a7f75d054fe5e2306a704fc8257b4cf6f99faf.zip cpython-58a7f75d054fe5e2306a704fc8257b4cf6f99faf.tar.gz cpython-58a7f75d054fe5e2306a704fc8257b4cf6f99faf.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.
........
Diffstat (limited to 'Lib')
| -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')) |