Changeset 148:efee6e971771

Timestamp:

05/05/10 14:05:39 (21 months ago)

Author:

Menno Smits <menno@…>

Branch:

default

Message:

Always return folder names as unicode for consistency.

Otherwise sometimes the folder names are unicode and sometimes they
are strs. This is good practice for Python 3.

Location:

imapclient

Files:

• imap_utf7.py (modified) (1 diff)
• test/test_IMAPClient.py (modified) (1 diff)
• test/test_imap_utf7.py (modified) (1 diff)

imapclient/imap_utf7.py

@@ -71 +71 @@
     if decode:
         r.append(modified_unbase64(''.join(decode[1:])))
-    return ''.join(r)
+    out = ''.join(r)
+
+    if not isinstance(out, unicode):
+        out = unicode(out, 'latin-1')
+    return out
 
 

imapclient/test/test_IMAPClient.py

@@ -84 +84 @@
                                                  '',
                                                  '(\\HasNoChildren \\UnMarked) "/" "INBOX"'])
-        self.assertEqual(folders, [(['\\NoInferiors', '\\UnMarked'], "/", 'bang\xff'),
-                                   (['\\HasNoChildren', '\\UnMarked'], "/", 'INBOX')])
+        self.assertEqual(folders, [(['\\NoInferiors', '\\UnMarked'], "/", u'bang\xff'),
+                                   (['\\HasNoChildren', '\\UnMarked'], "/", u'INBOX')])
 
 

imapclient/test/test_imap_utf7.py

@@ -48 +48 @@
     def test_decode(self):
         for (input, output) in self.tests:
-            self.assertEquals(input, decode(output))
+            decoded = decode(output)
+            self.assertEquals(input, decoded) 
+            self.assert_(isinstance(decoded, unicode))