Update OAuth library.

diff --git a/tweepy/oauth.py b/tweepy/oauth.py
index 3a42e20f91ffeb6b4fd7eb60cc4cf20198e108e6..b6284c55bfdf033b656eb6efb83ffe52aae6fb50 100644 (file)
--- a/tweepy/oauth.py
+++ b/tweepy/oauth.py
@@ -316,9 +316,11 @@ class OAuthRequest(object):
 
         if token:
             parameters['oauth_token'] = token.key
-            parameters['oauth_callback'] = token.callback
+            if token.callback:
+                parameters['oauth_callback'] = token.callback
             # 1.0a support for verifier.
-            parameters['oauth_verifier'] = verifier
+            if verifier:
+                parameters['oauth_verifier'] = verifier
         elif callback:
             # 1.0a support for callback in the request token request.
             parameters['oauth_callback'] = callback
@@ -411,7 +413,10 @@ class OAuthServer(object):
         """
         version = self._get_version(oauth_request)
         consumer = self._get_consumer(oauth_request)
-        verifier = self._get_verifier(oauth_request)
+        try:
+            verifier = self._get_verifier(oauth_request)
+        except OAuthError:
+            verifier = None
         # Get the request token.
         token = self._get_token(oauth_request, 'request')
         self._check_signature(oauth_request, consumer, token)