Changeset 229:85569119917a

Timestamp:

03/06/11 16:30:15 (12 months ago)

Author:

Menno Smits <menno@…>

Branch:

default

Message:

Halfway through re-working how BODY/BODYSTRUCTURE is handled so the parser doesn't have to treat paren lists without whitespace between them specially.

The failing tests light the way.

Location:

imapclient

Files:

• response_lexer.py (modified) (2 diffs)
• response_parser.py (modified) (3 diffs)

imapclient/response_lexer.py

@@ -95 +95 @@
                         yield nextchar + read_until(stream_i, nextchar)
                     else:
-                        # Other punctuation, eg. "("
+                        # Other punctuation, eg. "(". This ends the current token.
                         if token:
                             yield token
-                        if nextchar == ')' and stream_i.peek() == '(':
-                            stream_i.next()     # Read the '('
-                            yield ')('
-                        else:
-                            yield nextchar    # yield the punctuation
+                        yield nextchar
                     break
             else:
@@ -165 +161 @@
         self.pushed.append(item)
 
-    def peek(self, default=NO_MORE):
-        if not self.pushed:
-            try:
-                self.pushed.append(self.it.next())
-            except StopIteration:
-                return default
-        return self.pushed[-1]
-
         
         

imapclient/response_parser.py

@@ -91 +91 @@
                 msg_data[word] = _convert_INTERNALDATE(value)
             elif word in ('BODY', 'BODYSTRUCTURE'):
-                msg_data[word] = BodyData(value)
+                msg_data[word] = BodyData.create(value)
             else:
                 msg_data[word] = value
@@ -109 +109 @@
 class BodyData(tuple):
 
+    @classmethod
+    def create(cls, response):
+        # In case of multipart messages we will see at least 2 tuples
+        # at the start. Restructure these in to a list so that the
+        # returned response tuple always has a consistent number of
+        # items regardless of whether the message is multipart or not.
+        raise NotImplementedError
+    
     @property
     def is_multipart(self):
@@ -165 +173 @@
         if token == ")":
             return tuple(out)
-        elif token == ')(':
-            return parse_juxtaposed_tuples(src, out)
-        else:
-            out.append(atom(src, token))
+        out.append(atom(src, token))
     # no terminator
     raise ParseError('Tuple incomplete before "(%s"' % _fmt_tuple(out))
-
-
-def parse_juxtaposed_tuples(src, init):
-    out = [tuple(init)]
-    current = []
-    for token in src:
-        if token in (')', ')('):
-            out.append(tuple(current))
-            if token == ')':
-                return out
-            current = []
-        else:
-            current.append(atom(src, token))
-
-    # no terminator
-    preceeding = ''.join('(' + _fmt_tuple(t) + ')' for t in out)
-    if current:
-        preceeding += '(' + _fmt_tuple(current)
-    raise ParseError('Juxtaposed tuples incomplete before "%s"' % preceeding)