Changeset 229:85569119917a for imapclient/response_lexer.py

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.

Files:

• imapclient/response_lexer.py (modified) (2 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]
-