Changeset 194:573b41f0311c for imapclient

Timestamp:

01/14/11 13:07:38 (16 months ago)

Author:

Menno Smits <menno@…>

Branch:

default

Message:

get_folder_delimiter tidied up and deprecated

Files:

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

imapclient/imapclient.py

@@ -7 +7 @@
 import response_lexer
 from operator import itemgetter
+import warnings
 #imaplib.Debug = 5
 
@@ -161 +162 @@
         """Determine the folder separator used by the IMAP server.
 
+        WARNING: The implementation just picks the first folder
+        separator from the first namespace returned. This is not
+        particularly sensible. Use namespace instead().
+
         @return: The folder separator.
         @rtype: string
         """
-        typ, data = self._imap.namespace()
-        self._checkok('namespace', typ, data)
-
-        match = self.re_sep.match(data[0])
-        if match:
-            return match.group(1)
-        else:
-            raise self.Error('could not determine folder separator')
+        warnings.warn(DeprecationWarning('get_folder_delimiter is going away. Use namespace() instead.'))
+        for part in self.namespace():
+            for ns in part:
+                return ns[1]
+        raise self.Error('could not determine folder separator')
 
     def list_folders(self, directory="", pattern="*"):