Switched to python-oauth2

diff --git a/social_auth/backends/__init__.py b/social_auth/backends/__init__.py
index ca13e8b13eb819d63f02bbb9bd6198746f95f497..dee177025d13f200f424d0cbc5fb6eda3d177a9c 100644 (file)
--- a/social_auth/backends/__init__.py
+++ b/social_auth/backends/__init__.py
@@ -17,8 +17,8 @@ from openid.consumer.consumer import Consumer, SUCCESS, CANCEL, FAILURE
 from openid.consumer.discover import DiscoveryFailure
 from openid.extensions import sreg, ax
 
-from oauth.oauth import OAuthConsumer, OAuthToken, OAuthRequest, \
-                        OAuthSignatureMethod_HMAC_SHA1
+from oauth2 import Consumer as OAuthConsumer, Token as OAuthToken, Request as OAuthRequest, \
+                        SignatureMethod_HMAC_SHA1 as OAuthSignatureMethod_HMAC_SHA1
 
 from django.conf import settings
 from django.contrib.auth import authenticate
@@ -542,7 +542,7 @@ class ConsumerBasedOAuth(BaseOAuth):
 
     def fetch_response(self, request):
         """Executes request and fetchs service response"""
-        self.connection.request(request.http_method, request.to_url())
+        self.connection.request(request.method, request.to_url())
         response = self.connection.getresponse()
         return response.read()