Changeset 142:f5a6a5297de1 for imapclient

Timestamp:

04/29/10 14:01:30 (2 years ago)

Author:

Menno Smits <menno@…>

Branch:

default

Message:

Correctly handle \" in quoted strings.

(As reported in comments of #28)

It turns out these were being handled twice causing them to be
incorrectly removed if a string started with a double quote.

Extended tests to cover more cases around escaped double quotes. Prior
to this the test weren't covering enough cases.

Location:

imapclient

Files:

• response_parser.py (modified) (1 diff)
• test/test_IMAPClient.py (modified) (1 diff)
• test/test_response_parser.py (modified) (2 diffs)

imapclient/response_parser.py

@@ -208 +208 @@
                                 literal_len, len(literal_text)))
         return literal_text
-    elif token.startswith('"'):
-        return token[1:-1]
     elif token.isdigit():
         return int(token)

imapclient/test/test_IMAPClient.py

@@ -92 +92 @@
                                                  r'(\HasNoChildren) "/" "Left\"Right"',
                                                  r'(\HasNoChildren) "/" "Left\\Right"',
+                                                 r'(\HasNoChildren) "/" "\"Left Right\""',
+                                                 r'(\HasNoChildren) "/" "\"Left\\Right\""',
                                                  ])
         self.assertEqual(folders, [(['\\HasNoChildren'], '/', 'Test "Folder"'),
                                    (['\\HasNoChildren'], '/', 'Left\"Right'),
-                                   (['\\HasNoChildren'], '/', r'Left\Right')])
+                                   (['\\HasNoChildren'], '/', r'Left\Right'),
+                                   (['\\HasNoChildren'], '/', r'"Left Right"'),
+                                   (['\\HasNoChildren'], '/', r'"Left\Right"'),
+                                   ])
 
     def test_empty_response(self):

imapclient/test/test_response_parser.py

@@ -133 +133 @@
 
     def test_quoted_specials(self):
+        self._test(r'"\"foo bar\""', '"foo bar"')
         self._test(r'"foo \"bar\""', 'foo "bar"')
         self._test(r'"foo\\bar"', r'foo\bar')
@@ -157 +158 @@
             to_parse = [to_parse]
         output = parse_response(to_parse)
-        self.assert_(
-                output == expected,
-                format_error(to_parse, output, expected),
-            )
+        self.assert_(output == expected,
+                     format_error(to_parse, output, expected))
 
     def _test_parse_error(self, to_parse, expected_msg):