Changeset 96:6f290ccd5e5b

Timestamp:

05/01/10 13:42:35 (2 years ago)

Author:

Menno Smits <menno@…>

Branch:

default

Message:

Fixed problem when literal is followed by a non-literal (#33)

This problem manifested itself with GMail's IMAP. Patch based on what
Fergal sent in with the bug report.

Files:

• THANKS (modified) (1 diff)
• imapclient/imapclient.py (modified) (2 diffs)
• imapclient/test/test_FetchParser.py (modified) (1 diff)

THANKS

@@ -23 +23 @@
 Brian Jackson
 Neil Martinsen-Burrell
+Fergal (fergal _AT_ esatclear.ie)
 
 

imapclient/imapclient.py

@@ -599 +599 @@
 
         data = data.lstrip()
+        msgid = None
         if data[0].isdigit():
             # Get message ID
@@ -606 +607 @@
             assert data.startswith('('), data
             data = data[1:]
-            if data.endswith(')'):
-                data = data[:-1]
-
-        else:
-            msgid = None
+
+        if data.endswith(')'):
+            data = data[:-1]
 
         for name, item in FetchTokeniser().process_pairs(data):

imapclient/test/test_FetchParser.py

@@ -180 +180 @@
 
     def testMultiTypesWithLiteral(self):
-        self._parse_test(
-            [
-                ('1 (INTERNALDATE " 9-Feb-2007 17:08:08 +0100" RFC822 {21}',
-                      'Subject: test\r\n\r\nbody'),
-                ')'
-                ],
-            {1: {
-                    'INTERNALDATE': datetime_to_native(datetime.datetime(2007, 2, 9,
-                                                                         17, 8, 8, 0,
-                                                                         FixedOffset(60))),
-                    'RFC822': 'Subject: test\r\n\r\nbody',
+        expected = {1: {'INTERNALDATE': datetime_to_native(datetime.datetime(2007, 2, 9,
+                                                                             17, 8, 8, 0,
+                                                                             FixedOffset(60))),
+                        'RFC822': 'Subject: test\r\n\r\nbody'}
                     }
-                }
-            )
+        self._parse_test([('1 (INTERNALDATE " 9-Feb-2007 17:08:08 +0100" RFC822 {21}',
+                           'Subject: test\r\n\r\nbody'), ')'],
+                         expected)
+
+        # Also test where there literal comes back first
+        self._parse_test([('1 (RFC822 {21}', 'Subject: test\r\n\r\nbody'),
+                           'INTERNALDATE " 9-Feb-2007 17:08:08 +0100")'],
+                           expected)
 
     def testLiteralsWithSections(self):