encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-12-04 07:24:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #776 from atlefren/master

Browse Source 
Proper import of errors from oauth_provider
This commit is contained in:
Tom Christie 2013-04-03 04:48:46 -07:00
commit cb20216173
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest_framework/authentication.py
View File

@ -230,7 +230,7 @@ class OAuthAuthentication(BaseAuthentication):
try: try:
consumer_key = oauth_request.get_parameter('oauth_consumer_key') consumer_key = oauth_request.get_parameter('oauth_consumer_key')
consumer = oauth_provider_store.get_consumer(request, oauth_request, consumer_key) consumer = oauth_provider_store.get_consumer(request, oauth_request, consumer_key)
except oauth_provider_store.InvalidConsumerError as err: except oauth_provider.store.InvalidConsumerError as err:
raise exceptions.AuthenticationFailed(err) raise exceptions.AuthenticationFailed(err)
if consumer.status != oauth_provider.consts.ACCEPTED: if consumer.status != oauth_provider.consts.ACCEPTED:
@ -240,7 +240,7 @@ class OAuthAuthentication(BaseAuthentication):
try: try:
token_param = oauth_request.get_parameter('oauth_token') token_param = oauth_request.get_parameter('oauth_token')
token = oauth_provider_store.get_access_token(request, oauth_request, consumer, token_param) token = oauth_provider_store.get_access_token(request, oauth_request, consumer, token_param)
except oauth_provider_store.InvalidTokenError: except oauth_provider.store.InvalidTokenError:
msg = 'Invalid access token: %s' % oauth_request.get_parameter('oauth_token') msg = 'Invalid access token: %s' % oauth_request.get_parameter('oauth_token')
raise exceptions.AuthenticationFailed(msg) raise exceptions.AuthenticationFailed(msg)