Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions requests_oauthlib/oauth1_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,16 @@ def __init__(self, message, status_code):
self.status_code = status_code


class TokenMissing(ValueError):
def __init__(self, message, response):
super(TokenRequestDenied, self).__init__(message)
self.response = response


class VerifierMissing(ValueError):
pass


class OAuth1Session(requests.Session):
"""Request signing and convenience methods for the oauth dance.

Expand Down Expand Up @@ -261,7 +271,7 @@ def fetch_access_token(self, url, verifier=None):
if verifier:
self._client.client.verifier = verifier
if not getattr(self._client.client, 'verifier', None):
raise ValueError('No client verifier has been set.')
raise VerifierMissing('No client verifier has been set.')
token = self._fetch_token(url)
log.debug('Resetting verifier attribute, should not be used anymore.')
self._client.client.verifier = None
Expand Down Expand Up @@ -293,7 +303,10 @@ def _populate_attributes(self, token):
if 'oauth_token' in token:
self._client.client.resource_owner_key = token['oauth_token']
else:
raise ValueError('Response does not contain a token. %s', token)
raise TokenMissing(
'Response does not contain a token: {resp}'.format(resp=token),
token,
)
if 'oauth_token_secret' in token:
self._client.client.resource_owner_secret = (
token['oauth_token_secret'])
Expand Down