Changeset 144:f644601710b1

Timestamp:

29/04/10 22:49:35 (22 months ago)

Author:

Menno Smits <menno@…>

Branch:

default

Message:

#43: numeric folder names break list_folders

Further hacks to the lexer to allow the response parser to
distinguish between a string with digits in it and an actual
integer. This prevents folder names comprising of just
digits from being returned as integers instead of strings.

Files:

• imapclient/response_parser.py (modified) (3 diffs)
• livetest.py (modified) (1 diff)

imapclient/response_parser.py

@@ -141 +141 @@
 
     def read(self, n):
-        # We also hack into the lexer so we get special treatment for '\\'
-        # chars - they are only special inside a quoted string.
+        # Two additional hacks:
+        # 1. Hack into the lexer so we get special treatment for backslash
+        #    chars - they are only special inside a quoted string.
+        # 2. For quoted strings return the quotes around the string so
+        #    that atom() can distinguish numbers from strings. Eg. "123" vs 123.
+        #    These are stripped off before returning them to the user.
         assert n==1
         if self.pushed is not None:
@@ -149 +153 @@
         else:
             ret = self.src.read(n)
-            if ret=="\\" and self.lexer.state not in '"\\':
+            if ret == "\\" and self.lexer.state not in '"\\':
                 self.pushed = "\\"
+            elif ret == '"' and self.lexer.state != '\\':
+                self.lexer.token += '"'
         return ret
 
@@ -208 +214 @@
                                 literal_len, len(literal_text)))
         return literal_text
+    elif len(token) >= 2 and (token[0] == token[-1] == '"'):
+        return token[1:-1]
     elif token.isdigit():
         return int(token)

livetest.py

@@ -147 +147 @@
                     'foo "bar"',
                     'stuff & things',
-                    u'test & \u2622']
+                    u'test & \u2622',
+                    '123']
 
     for folder in test_folders: