Changeset 278:f702a10af3d6 for imapclient

Timestamp:

09/11/11 20:40:19 (6 months ago)

Author:

Menno Smits <menno@…>

Branch:

default

Message:

Fix incorrect msg_id for UID fetch when use_uid is False (#99)

Don't use the UID as the key for FETCH responses where use_uid is
False but UID is a fetch item. The UID was being used as the key
instead of the message sequence.

Location:

imapclient

Files:

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

imapclient/imapclient.py

@@ -674 +674 @@
         self._checkok('fetch', typ, data)
         typ, data = self._imap._untagged_response(typ, data, 'FETCH')
-        return parse_fetch_response(data, self.normalise_times)
+        return parse_fetch_response(data, self.normalise_times, self.use_uid)
 
     def append(self, folder, msg, flags=(), msg_time=None):

imapclient/response_parser.py

@@ -52 +52 @@
 
 
-def parse_fetch_response(text, normalise_times=True):
+def parse_fetch_response(text, normalise_times=True, uid_is_key=True):
     """Pull apart IMAP FETCH responses as returned by imaplib.
 
@@ -87 +87 @@
 
             if word == 'UID':
-                msg_id = _int_or_error(value, 'invalid UID')
+                uid = _int_or_error(value, 'invalid UID')
+                if uid_is_key:
+                    msg_id = uid
+                else:
+                    msg_data[word] = uid
             elif word == 'INTERNALDATE':
                 msg_data[word] = _convert_INTERNALDATE(value, normalise_times)

imapclient/test/test_response_parser.py

@@ -198 +198 @@
 
 
-    def test_repeated_UID(self):
-        self.assertEquals(parse_fetch_response(['23 (UID 76 FOO 123 UID 76 GOO 321)']),
-                          {76: {'FOO': 123,
-                                'GOO': 321,
+    def test_not_uid_is_key(self):
+        self.assertEquals(parse_fetch_response(['23 (UID 76)'], uid_is_key=False),
+                          {23: {'UID': 76,
                                 'SEQ': 23}})
-        self.assertEquals(parse_fetch_response(['23 (UID 76 FOO 123', 'UID 76 GOO 321)']),
-                          {76: {'FOO': 123,
-                                'GOO': 321,
-                                'SEQ': 23}})
-
 
     def test_bad_UID(self):