Python - to support 1.0, do not throw errors for missing 1.0a parameters. Thanks to Toby White for the patch and Mike Malone for confirming.

git-svn-id: https://oauth.googlecode.com/svn/code/python@1124 f7ae4463-c52f-0410-a7dc-93bad6e629e8

Author: leah.culver

oauth/oauth.py

@@ -316,9 +316,11 @@ def from_consumer_and_token(oauth_consumer, token=None,
 
         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 @@ def fetch_access_token(self, oauth_request):
         """
         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)