Changeset 115:7aa870b75d11 for imapclient/imapclient.py

Timestamp:

01/11/10 19:11:54 (2 years ago)

Author:

Menno Smits <menno@…>

Branch:

default

Message:

Parse imaplib's fetch data structures instead of doing it all ourselves

This makes the code messier but means imaplib does a bit more of the
heavy lifting - this is probably safer from a bug standpoint.

From Mark Hammond.

Files:

• imapclient/imapclient.py (modified) (4 diffs)

imapclient/imapclient.py

@@ -14 +14 @@
 __all__ = ['IMAPClient', 'DELETED', 'SEEN', 'ANSWERED', 'FLAGGED', 'DRAFT',
     'RECENT']
+
+from response_parser import parse_fetch_response
 
 # System flags
@@ -327 +329 @@
 
         self._checkok('search', typ, data)
+        if data == [None]: # no untagged responses...
+            return []
 
         return [ long(i) for i in data[0].split() ]
@@ -436 +440 @@
         return parser(data)
 
-
     def altfetch(self, messages, parts):
         if not messages:
@@ -448 +451 @@
         else:
             tag = self._imap._command('FETCH', msg_list, parts_list)
-
-        print tag
-        lines = []
-        while True:
-            line = self._imap._get_line()
-            if line.startswith(tag):
-                break
-            lines.append(line)
-        return lines
-    
-        #self._checkok('fetch', typ, data)
-
-        #parser = FetchParser()
-        #return parser(data)
-
+        typ, data = self._imap._command_complete('FETCH', tag)
+        self._checkok('fetch', typ, data)
+        typ, data = self._imap._untagged_response(typ, data, 'FETCH')
+        # appears to be a special case - no 'untagged' responses (ie, no
+        # folders) results in [None]
+        if data == [None]:
+          return {}
+
+        return parse_fetch_response(data)
 
     def append(self, folder, msg, flags=(), msg_time=None):