From 3130dc171010d4dbd4c4f0b0a3a9ef671ea0937f Mon Sep 17 00:00:00 2001 From: Devin Sevilla Date: Fri, 22 Feb 2013 22:18:29 -0500 Subject: [PATCH 1/2] Use python-oauth2 library instead of oauth --- social_auth/backends/contrib/tumblr.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/social_auth/backends/contrib/tumblr.py b/social_auth/backends/contrib/tumblr.py index 4df3fb2d0..50077d114 100644 --- a/social_auth/backends/contrib/tumblr.py +++ b/social_auth/backends/contrib/tumblr.py @@ -12,9 +12,7 @@ https://github.com/gkmngrgn/django-tumblr-auth """ -from oauth.oauth import OAuthToken as Token -from oauth.oauth import OAuthRequest -from oauth.oauth import OAuthSignatureMethod_HMAC_SHA1 as SignatureMethod_HMAC_SHA1 +from oauth2 import Request as OAuthRequest, Token as OAuthToken, SignatureMethod_HMAC_SHA1 from urllib import urlopen from django.utils import simplejson from social_auth.backends import ConsumerBasedOAuth @@ -89,7 +87,7 @@ def unauthorized_token(self): request = self.oauth_request(token=None, url=self.REQUEST_TOKEN_URL) response = self.fetch_response(request) - return Token.from_string(response) + return OAuthToken.from_string(response) def oauth_request(self, token, url, extra_params=None): params = { From 07faedd834dc3ef0b2479c30ec748e47200f7d6b Mon Sep 17 00:00:00 2001 From: Devin Sevilla Date: Fri, 22 Feb 2013 22:19:06 -0500 Subject: [PATCH 2/2] Drop USERNAME value, use the string directly --- social_auth/backends/contrib/tumblr.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/social_auth/backends/contrib/tumblr.py b/social_auth/backends/contrib/tumblr.py index 50077d114..63c2df2d3 100644 --- a/social_auth/backends/contrib/tumblr.py +++ b/social_auth/backends/contrib/tumblr.py @@ -17,7 +17,6 @@ from django.utils import simplejson from social_auth.backends import ConsumerBasedOAuth from social_auth.backends import OAuthBackend -from social_auth.backends import USERNAME TUMBLR_SERVER = 'www.tumblr.com' TUMBLR_AUTHORIZATION_URL = 'http://%s/oauth/authorize' % TUMBLR_SERVER @@ -30,14 +29,14 @@ class TumblrBackend(OAuthBackend): name = 'tumblr' def get_user_id(self, details, response): - return details[USERNAME] + return details['username'] def get_user_details(self, response): # http://www.tumblr.com/docs/en/api/v2#user-methods user_info = response['response']['user'] data = { - USERNAME: user_info['name'], + 'username': user_info['name'], } blogs = user_info['blogs']