Changeset 171:81ccefd2036e for imapclient

Timestamp:

09/10/10 20:27:56 (21 months ago)

Author:

Menno Smits <menno@…>

Branch:

default

Children:

172:6317981e42a5, 179:970ef3c54d53

Message:

Tokens shouldn't necessarily terminate after a "]"

This was breaking partial fetch response parsing.

Location:

imapclient

Files:

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

imapclient/response_lexer.py

@@ -82 +82 @@
                 if nextchar in wordchars:
                     token += nextchar
+                elif nextchar == '[':
+                    token += nextchar + read_until(stream_i, ']', escape=False)
                 else:
-                    if nextchar == '[':
-                        yield token + nextchar + read_until(stream_i, ']', escape=False)
-                    elif nextchar in whitespace:
+                    if nextchar in whitespace:
                         yield token
                     elif nextchar == '"':

imapclient/test/test_response_parser.py

@@ -140 +140 @@
         self._test('foo[bar rrr]', 'foo[bar rrr]')
         self._test('"foo[bar rrr]"', 'foo[bar rrr]')
-        self._test('[foo bar]', '[foo bar]')  # Square brackets at start
+        self._test('[foo bar]def', '[foo bar]def')
         self._test('(foo [bar rrr])', ('foo', '[bar rrr]'))
         self._test('(foo foo[bar rrr])', ('foo', 'foo[bar rrr]'))
@@ -265 +265 @@
             { 31710: {'BODY[HEADER.FIELDS (FROM SUBJECT)]': header_text,
                       'SEQ': 123}})
-              
+
+
+    def test_partial_fetch(self):
+        body = '01234567890123456789'
+        self.assertEquals(parse_fetch_response(
+            [('123 (UID 367 BODY[]<0> {20}', body), ')']),
+            { 367: {'BODY[]<0>': body,
+                    'SEQ': 123}})
+                    
 
     def test_INTERNALDATE(self):