Changeset 109:bfb2aabc0b11 for imapclient/response_parser.py

Timestamp:

12/17/09 12:00:01 (2 years ago)

Author:

Menno Smits <menno@…>

Branch:

default

Message:

committing response parser progress so far, lots of failing tests

Files:

• imapclient/response_parser.py (modified) (3 diffs)

imapclient/response_parser.py

@@ -6 +6 @@
 
 import shlex
+from cStringIO import StringIO
 
 #XXX higher level response type response type processing
@@ -21 +22 @@
 
 def parse_response(text):
-    #XXX
+    #XXX doc
     src = ResponseTokeniser(text)
     try:
-        return tuple([atom(src, token) for token in src])
+        return tuple(atom(src, token) for token in src)
     except ParseError:
         raise
@@ -32 +33 @@
 
 def parse_fetch_response(text):
-    #XXX
-    response = parse_response(text)
+    response = iter(parse_response(text))
 
-    msgid = response[0]
+    def expect(expected_value):
+        next_value = response.next()
+        if next_value != expected_value:
+            raise ParseError('expected %r, got %r' % (expected_value, next_value))
 
-    # Second item should be FETCH
-    if response[1] != 'FETCH':
-        raise ParseError('not a FETCH response')
-
-
+    msg_data = {}
+    while True:
+        try:
+            expect('*')
+        except StopIteration:
+            break
+        msgid = int(response.next())
+        expect('FETCH')
+        msg_data[msgid] = response.next()
+    return msg_data