Changeset 195:f9d8c6ff0784 for imapclient

Timestamp:

01/14/11 13:42:24 (16 months ago)

Author:

Menno Smits <menno@…>

Branch:

default

Message:

Handle [None] response in fetch response parser

Location:

imapclient

Files:

• imapclient.py (modified) (2 diffs)
• response_parser.py (modified) (1 diff)
• test/test_response_parser.py (modified) (1 diff)

imapclient/imapclient.py

@@ -508 +508 @@
         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)
 
@@ -638 +633 @@
             typ, data = self._imap.store(msg_list, cmd, flag_list)
         self._checkok('store', typ, data)
-
         return self._flatten_dict(parse_fetch_response((data)))
 

imapclient/response_parser.py

@@ -50 +50 @@
     keyed by FETCH field type (eg."RFC822").
     """
+    if text == [None]:
+        return {}
     response = gen_parsed_response(text)
 

imapclient/test/test_response_parser.py

@@ -205 +205 @@
 
 
+    def test_none_special_case(self):
+        self.assertEquals(parse_fetch_response([None]), {})
+
+
     def test_bad_msgid(self):
         self.assertRaises(ParseError, parse_fetch_response, ['abc ()'])