Changed names for IMAP/SMTP client file names. Fixed minor bug in build_xoauth_string().

Author: joestump

oauth2/__init__.py

@@ -65,16 +65,16 @@ def build_authenticate_header(realm=''):
 
 def build_xoauth_string(url, consumer, token=None):
     """Build an XOAUTH string for use in SMTP/IMPA authentication."""
-    request = oauth.Request.from_consumer_and_token(consumer, token, 
+    request = Request.from_consumer_and_token(consumer, token, 
         "GET", url)
 
-    signing_method = oauth.SignatureMethod_HMAC_SHA1()
+    signing_method = SignatureMethod_HMAC_SHA1()
     request.sign_request(signing_method, consumer, token)
 
     params = []
     for k,v in sorted(request.iteritems()):
         if v is not None:
-            params.append('%s="%s"' % (k, oauth.escape(v)))
+            params.append('%s="%s"' % (k, escape(v)))
 
     return "%s %s %s" % ("GET", url, ','.join(params))
 

oauth2/clients/imaplib.py renamed to oauth2/clients/imap.py

@@ -1,14 +1,16 @@
 import oauth2
 import smtplib
+import base64
 
-class SMTP(smtplib.SMTP, oauth2.XOAuth):
+
+class SMTP(smtplib.SMTP):
     def authenticate(self, url, consumer, token):
         if consumer is not None and not isinstance(consumer, oauth2.Consumer):
             raise ValueError("Invalid consumer.")
 
         if token is not None and not isinstance(token, oauth2.Token):
             raise ValueError("Invalid token.")
 
-        smtp_conn.docmd('AUTH', 'XOAUTH %s' + \
-            base64.b64encode(oauth2.build_xoauth_string(url, consumer, token))
+        self.docmd('AUTH', 'XOAUTH %s' + \
+            base64.b64encode(oauth2.build_xoauth_string(url, consumer, token)))