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.
........

diff --git a/Lib/email/message.py b/Lib/email/message.py
index 3608d1a959788eedf3c73c43d3beccf0415bed33..27a577dac70f5a93e6d4b5a554582496fe657966 100644 (file)
--- 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 5e4d9ba149f66cab0557b82849bcc72ae9068727..cd28206913320ab7557f64131c2acc54fd42cffb 100644 (file)
--- 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')

diff --git a/Misc/ACKS b/Misc/ACKS
index d2c01aa9f591a097eb4b8925af8ad391bf38f29f..4471ab1e78f19bdb2177e0bba0b288293838df60 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -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

diff --git a/Misc/NEWS b/Misc/NEWS
index e17ceef72533894f0e2685d21c8ec1617d5ed463..489b0ed666a5fd8181d7d206104e41bcf9fc9492 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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