Changeset 135:95602aca2277 for imapclient

Timestamp:

02/08/10 13:06:35 (2 years ago)

Author:

Menno Smits <menno@…>

Branch:

default

Message:

Handle empty strings and None's in the folder list responses again

All tests passing.

Location:

imapclient

Files:

• imapclient.py (modified) (1 diff)
• test/test_IMAPClient.py (modified) (1 diff)

imapclient/imapclient.py

@@ -205 +205 @@
 
     def _proc_folder_list(self, folder_data):
-        # appears to be a special case - no 'untagged' responses (ie, no
-        # folders) returns [None]
-        if folder_data == [None]:
-            return []
+        # Filter out empty strings and None's.
+        # This also deals with the special case of - no 'untagged'
+        # responses (ie, no folders). This comes back as [None].
+        folder_data = [item for item in folder_data if item not in ('', None)]
+
         ret = []
         parsed = parse_response(folder_data)

imapclient/test/test_IMAPClient.py

@@ -97 +97 @@
                                    (['\\HasNoChildren'], '/', r'Left\Right')])
 
+    def test_empty_response(self):
+        self.assertEqual(self.client._proc_folder_list([None]), [])
+
+
     def test_blanks(self):
-        folders = self.client._proc_folder_list(['', None, 
-                                                 r'(\\HasNoChildren) "/" "last"',
-                                                ])
-        self.assert_(folders == ['last'], 'got %r' % folders)
+        folders = self.client._proc_folder_list(['', None, r'(\HasNoChildren) "/" "last"'])
+        self.assertEqual(folders, [([r'\HasNoChildren'], '/', 'last')])