Changeset 62:f2f61addae93 for imapclient/imapclient.py

Timestamp:

11/04/09 23:28:10 (3 years ago)

Author:

Menno Smits <menno@…>

Branch:

default

convert_revision:

menno@pali-20090411222810-0r33czn9bjwh5fsy

Message:

Folder escaping is working. Live test is passing correctly. Still needs more testing and documentation updates.

Files:

• imapclient/imapclient.py (modified) (5 diffs)

imapclient/imapclient.py

@@ -21 +21 @@
 #imaplib.Debug = 5
 
+#XXX 
+import imap_utf7
+
 __all__ = ['IMAPClient', 'DELETED', 'SEEN', 'ANSWERED', 'FLAGGED', 'DRAFT',
     'RECENT']
@@ -91 +94 @@
         self.folder_encode = True
 
-    
-    def _set_folder_encode(self, on_off):
-        if on_off:
-            self._folder_encode = True
-            self._decode_folder_name = decode_folder_name
-            self._encode_folder_name = encode_folder_name
-        else:
-            self._folder_encode = False
-            self._decode_folder_name = lambda x: x
-            self._encode_folder_name = self._decode_folder_name
-
-    folder_encode = property(lambda self: self._folder_encode,
-                             _set_folder_encode,
-                             None,
-                             "Set True to have folder names transparently encoded/decoded")
-
-
+   
     def login(self, username, password):
         '''Perform a simple login
@@ -464 +451 @@
         flags_list = seq_to_parenlist(flags)
 
-        typ, data = self._imap.append(folder, flags_list, time_val, msg)
+        typ, data = self._imap.append(self._encode_folder_name(folder),
+                                      flags_list, time_val, msg)
         self._checkok('append', typ, data)
 
@@ -553 +541 @@
             for msgid, data in fetch_dict.iteritems()
             ])
+
+    def _decode_folder_name(self, name):
+        if self.folder_encode:
+            return imap_utf7.decode(name)
+        return name
+
+
+    def _encode_folder_name(self, name):
+        if self.folder_encode:
+            return imap_utf7.encode(name)
+        return name
 
 
@@ -767 +766 @@
 
 
-def encode_folder_name(name):
-    """Take a folder name and escape ampersands so that the correct name is
-    seen by the IMAP server.
-
-    @param name: Mailbox name (eg. "stuff & things")
-    @return: Encoded mailbox name (eg. "stuff &- things")
-    """
-    #TODO - full UTF-7 handling
-    return name.replace('&', '&-')
-
-
-#XXX test that decode name matched re-encoded name, if it doesn't return the original
-def decode_folder_name(name):
-    """Take a folder name as returned by an IMAP server and unescape
-    ampersands so that the expected name is seen.
-
-    @param name: Encoded mailbox name (eg. "stuff &- things")
-    @return: Mailbox name (eg. "stuff & things")
-    """
-    #TODO - full UTF-7 handling
-    return name.replace('&-', '&')
-