Ticket #33: IMAPClient-fix-fetch.diff

imapclient/imapclient.py

@@ -605 +605 @@
 
             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):
             name = name.upper()

imapclient/test/test_FetchParser.py

@@ -179 +179 @@
             )
 
     def testMultiTypesWithLiteral(self):
+        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'),
                 ')'
                 ],
-            {1: {
-                    'INTERNALDATE': datetime_to_native(datetime.datetime(2007, 2, 9,
-                                                                         17, 8, 8, 0,
-                                                                         FixedOffset(60))),
-                    'RFC822': 'Subject: test\r\n\r\nbody',
-                    }
-                }
+            expected
+            )
+        self._parse_test(
+            [
+                ('1 (RFC822 {21}',
+                      'Subject: test\r\n\r\nbody'),
+                ' INTERNALDATE " 9-Feb-2007 17:08:08 +0100")'
+                ],
+            expected
             )
 
     def testLiteralsWithSections(self):