Changeset 209:80f530da50d7

Timestamp:

03/23/11 15:22:37 (14 months ago)

Author:

Johannes Heckel <stone.pixel@…>

Branch:

idle+oauth

Children:

210:2c3edbf7da22, 211:6e64dc583fa7

Parents:

208:3eeca2dda55d (diff), 207:835686a87307 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge idle and oauth features.

Files:

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

imapclient/imapclient.py

@@ -4 +4 @@
 
 import re
-import imaplib
 import response_lexer
 from operator import itemgetter
 import warnings
+
+try:
+    import imaplib2 as imaplib
+    imaplib2 = True
+except ImportError:
+    imaplib2 = False
+    import imaplib
+    
 #imaplib.Debug = 5
-
+    
 try:
     import oauth2
@@ -288 +295 @@
         typ, data = self._imap.select(self._encode_folder_name(folder), readonly)
         self._checkok('select', typ, data)
-        return self._process_select_response(self._imap.untagged_responses)
-
+        if imaplib2:
+            untagged_responses = self._response_to_dict(self._imap.untagged_responses)
+        else:
+            untagged_responses = self._imap.untagged_responses
+        return self._process_select_response(untagged_responses)
+
+    def _response_to_dict(self, resp):
+        dictresp = {}
+
+        if len(resp) > 0:
+            for item in resp:
+                dictresp[item[0]] = item[1]
+
+        return dictresp
 
     def _process_select_response(self, resp):
@@ -307 +326 @@
         return out
 
-
+    def idle(self, timeout=None, **kwargs):
+        """Put server into IDLE mode.
+
+        IDLE mode will end when the server notifies of a change, the sever
+        reaches the timeout, or another IMAP4 command is scheduled.
+        
+        @param timeout: timeout for the IDLE command in seconds (default: 29 mins)
+        @param callback: Function to be called when IDLE mode ends. If a callback
+            is supplied the idle function will be asynchronous, returning immediately.
+        @param cb_arg: An optional argument that will be passed to the callback function.
+        @return: Server response. (None if callback is specified).
+        """
+        if imaplib2:
+            if 'callback' in kwargs:
+                callback = kwargs.pop('callback')
+                def _wrapped_callback(resp):
+                    typ, data = resp[0]
+                    self._checkok('idle', typ, data)
+                    # if there's a cb_arg, pass it along
+                    cb_arg = resp[1]
+                    if cb_arg:
+                        callback(data[0], cb_arg)
+                    else:
+                        callback(data[0])
+                self._imap.idle(timeout, callback=_wrapped_callback, **kwargs)
+            else:
+                typ, data = self._imap.idle(timeout)
+                self._checkok('idle', typ, data)
+                return data[0]
+        else:
+            raise self.Error('The imaplib2 module is required to use IDLE')
+                
     def folder_status(self, folder, what=None):
         """Requests the status from folder.
@@ -535 +585 @@
         else:
             tag = self._imap._command('FETCH', msg_list, parts_list, modifiers_list)
-        typ, data = self._imap._command_complete('FETCH', tag)
+        if imaplib2:
+            typ, data = self._imap._command_complete(tag, 'FETCH')
+        else:
+            typ, data = self._imap._command_complete('FETCH', tag)
         self._checkok('fetch', typ, data)
         typ, data = self._imap._untagged_response(typ, data, 'FETCH')

imapclient/imapclient.py

@@ -17 +17 @@
 #imaplib.Debug = 5
     
+try:
+    import oauth2
+except ImportError:
+    oauth2 = None
+
 import imap_utf7
 from fixed_offset import FixedOffset
@@ -120 +125 @@
         return data[0]
 
+    def oauth_login(self, url, oauth_token, oauth_token_secret,
+                    consumer_key='anonymous', consumer_secret='anonymous'):
+        """Authenticate using oauth.
+
+        @param url: The OAuth request URL.
+        @param oauth_token: An OAuth key.
+        @param oauth_token_secret: An OAuth secret.
+        @param consumer_key: An OAuth consumer key (defaults to 'anonymous').
+        @param consumer_secret: An OAuth consumer secret (defaults to 'anonymous').
+        """
+        if oauth2:
+            token = oauth2.Token(oauth_token, oauth_token_secret)
+            consumer = oauth2.Consumer(consumer_key, consumer_secret)
+            xoauth_callable = lambda x: oauth2.build_xoauth_string(url, consumer, token)
+            
+            typ, data = self._imap.authenticate('XOAUTH', xoauth_callable)
+            self._checkok('authenticate', typ, data)
+            return data[0]
+        else:
+            raise self.Error('The optional oauth2 dependency is needed for oauth authentication')
 
     def logout(self):