From 84ee3103a3d0fd5a56a8d33ddacacafe858d0e1c Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Wed, 14 Apr 2010 19:05:38 +0000 Subject: 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Lib/email/message.py') diff --git a/Lib/email/message.py b/Lib/email/message.py index d89e37e0b6..d09ab8fd13 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) -- cgit v1.2.1