From: Stas Kravets <krvss@mail.ru>
Date: Fri, 4 May 2012 15:05:19 +0000 (+0400)
Subject: Minor optimization and fixes
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a43f8a45e12f79a7cc64759c7d499f65353e2cec;p=django-social-auth.git

Minor optimization and fixes
---

diff --git a/social_auth/backends/contrib/mailru.py b/social_auth/backends/contrib/mailru.py
index 5e4ba15..9855a76 100644
--- a/social_auth/backends/contrib/mailru.py
+++ b/social_auth/backends/contrib/mailru.py
@@ -21,6 +21,7 @@ from urllib2 import Request, urlopen, HTTPError
 from hashlib import md5
 
 from social_auth.backends import OAuthBackend, BaseOAuth2, USERNAME
+from social_auth.utils import setting
 
 MAILRU_API_URL       = 'http://www.appsmail.ru/platform/api'
 MAILRU_OAUTH2_SCOPE  = ['']
@@ -35,7 +36,7 @@ class MailruBackend(OAuthBackend):
 
     def get_user_id(self, details, response):
         """Return user unique id provided by Mail.ru"""
-        return int(response['uid'])
+        return response['uid']
     
     def get_user_details(self, response):
         """Return user details from Mail.ru request"""
@@ -56,7 +57,7 @@ class MailruOAuth2(BaseOAuth2):
     SETTINGS_SECRET_NAME = 'MAILRU_OAUTH2_CLIENT_SECRET'
 
     def get_scope(self):
-        return MAILRU_OAUTH2_SCOPE + getattr(settings, 'MAILRU_OAUTH2_EXTRA_SCOPE', [])
+        return setting('MAILRU_OAUTH2_EXTRA_SCOPE', [])
 
     def auth_complete(self, *args, **kwargs):
         try:
diff --git a/social_auth/backends/contrib/odnoklassniki.py b/social_auth/backends/contrib/odnoklassniki.py
index fdd1967..aa3a29b 100644
--- a/social_auth/backends/contrib/odnoklassniki.py
+++ b/social_auth/backends/contrib/odnoklassniki.py
@@ -22,6 +22,7 @@ from urllib2 import Request, urlopen
 from hashlib import md5
 
 from social_auth.backends import OAuthBackend, BaseOAuth2, USERNAME
+from social_auth.utils import setting
 
 ODNOKLASSNIKI_API_URL       = 'http://api.odnoklassniki.ru/fb.do'
 ODNOKLASSNIKI_OAUTH2_SCOPE  = [''] # Enough for authentication
@@ -36,11 +37,10 @@ class OdnoklassnikiBackend(OAuthBackend):
 
     def get_user_id(self, details, response):
         """Return user unique id provided by Odnoklassniki"""
-        return int(response['uid'])
+        return response['uid']
     
     def get_user_details(self, response):
         """Return user details from Odnoklassniki request"""
-        import pdb; pdb.set_trace()
         values = { USERNAME: response['uid'], 'email': '', 'fullname': unquote(response['name']),
                   'first_name': unquote(response['first_name']), 'last_name': unquote(response['last_name'])}
         return values
@@ -55,7 +55,7 @@ class OdnoklassnikiOAuth2(BaseOAuth2):
     SETTINGS_SECRET_NAME = 'ODNOKLASSNIKI_OAUTH2_CLIENT_SECRET'
 
     def get_scope(self):
-        return ODNOKLASSNIKI_OAUTH2_SCOPE + getattr(settings, 'ODNOKLASSNIKI_OAUTH2_EXTRA_SCOPE', [])
+        return setting('ODNOKLASSNIKI_OAUTH2_EXTRA_SCOPE', [])
 
     def user_data(self, access_token, *args, **kwargs):
         """Return user data from Odnoklassniki REST API"""
diff --git a/social_auth/backends/contrib/vkontakte.py b/social_auth/backends/contrib/vkontakte.py
index c48c580..ea83884 100644
--- a/social_auth/backends/contrib/vkontakte.py
+++ b/social_auth/backends/contrib/vkontakte.py
@@ -18,6 +18,7 @@ from hashlib import md5
 from time import time
 
 from social_auth.backends import SocialAuthBackend, OAuthBackend, BaseAuth, BaseOAuth2, USERNAME
+from social_auth.utils import setting
 
 VKONTAKTE_API_URL        = 'https://api.vkontakte.ru/method/'
 VKONTAKTE_SERVER_API_URL = 'http://api.vkontakte.ru/api.php'
@@ -35,7 +36,7 @@ class VKontakteBackend(SocialAuthBackend):
 
     def get_user_id(self, details, response):
         """Return user unique id provided by VKontakte"""
-        return int(response.GET['id'])
+        return response.GET['id']
 
     def get_user_details(self, response):
         """Return user details from VKontakte request"""
@@ -131,7 +132,7 @@ class VKontakteOAuth2(BaseOAuth2):
     SETTINGS_SECRET_NAME = 'VKONTAKTE_APP_SECRET'
 
     def get_scope(self):
-        return VKONTAKTE_OAUTH2_SCOPE + getattr(settings, 'VKONTAKTE_OAUTH2_EXTRA_SCOPE', [])
+        return setting('VKONTAKTE_OAUTH2_EXTRA_SCOPE', [])
 
     def auth_complete(self, *args, **kwargs):
         if USE_APP_AUTH: