From 00bc3c474b3248747bac07dcc2bbc575cf5347d3 Mon Sep 17 00:00:00 2001 From: Stas Kravets Date: Wed, 9 May 2012 16:03:49 +0400 Subject: [PATCH] Logging update to use log function from utils, Facebook documentation update for merge --- doc/backends/facebook.rst | 3 +++ social_auth/backends/contrib/mailru.py | 7 ++----- social_auth/backends/contrib/odnoklassniki.py | 7 ++----- social_auth/backends/contrib/vkontakte.py | 7 ++----- social_auth/backends/contrib/yandex.py | 7 ++----- 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/doc/backends/facebook.rst b/doc/backends/facebook.rst index 098d04c..b7df58d 100644 --- a/doc/backends/facebook.rst +++ b/doc/backends/facebook.rst @@ -32,7 +32,10 @@ http://127.0.0.1:8000 or http://localhost:8000 because it won't work when testing. Instead I define http://myapp.com and setup a mapping on /etc/hosts or use dnsmasq_. +If you need to perform authentication from Facebook Canvas application, take a +look to `Facebook Canvas Application Authentication`_. .. _dnsmasq: http://www.thekelleys.org.uk/dnsmasq/doc.html .. _Facebook development resources: http://developers.facebook.com/docs/authentication/ .. _Facebook App Creation: http://developers.facebook.com/setup/ +.. _Facebook Canvas Application Authentication: http://www.ikrvss.ru/2011/09/22/django-social-auth-and-facebook-canvas-applications/ \ No newline at end of file diff --git a/social_auth/backends/contrib/mailru.py b/social_auth/backends/contrib/mailru.py index 9855a76..5794303 100644 --- a/social_auth/backends/contrib/mailru.py +++ b/social_auth/backends/contrib/mailru.py @@ -10,9 +10,6 @@ Then update your settings values using registration information """ -import logging -logger = logging.getLogger(__name__) - from django.conf import settings from django.utils import simplejson @@ -21,7 +18,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 +from social_auth.utils import setting, log MAILRU_API_URL = 'http://www.appsmail.ru/platform/api' MAILRU_OAUTH2_SCOPE = [''] @@ -91,7 +88,7 @@ def mailru_api(data): try: return simplejson.loads(urlopen(request).read()) except (TypeError, KeyError, IOError, ValueError, IndexError): - logger.error('Could not load data from Mail.ru.', exc_info=True, extra=dict(data=params)) + log('error', 'Could not load data from Mail.ru.', exc_info=True, extra=dict(data=params)) return None diff --git a/social_auth/backends/contrib/odnoklassniki.py b/social_auth/backends/contrib/odnoklassniki.py index aa3a29b..25d271b 100644 --- a/social_auth/backends/contrib/odnoklassniki.py +++ b/social_auth/backends/contrib/odnoklassniki.py @@ -11,9 +11,6 @@ mail to set settings values """ -import logging -logger = logging.getLogger(__name__) - from django.conf import settings from django.utils import simplejson @@ -22,7 +19,7 @@ from urllib2 import Request, urlopen from hashlib import md5 from social_auth.backends import OAuthBackend, BaseOAuth2, USERNAME -from social_auth.utils import setting +from social_auth.utils import setting, log ODNOKLASSNIKI_API_URL = 'http://api.odnoklassniki.ru/fb.do' ODNOKLASSNIKI_OAUTH2_SCOPE = [''] # Enough for authentication @@ -84,7 +81,7 @@ def odnoklassniki_api(data): try: return simplejson.loads(urlopen(request).read()) except (TypeError, KeyError, IOError, ValueError, IndexError): - logger.error('Could not load data from Odnoklassniki.', exc_info=True, extra=dict(data=params)) + log('error', 'Could not load data from Odnoklassniki.', exc_info=True, extra=dict(data=params)) return None # Backend definition diff --git a/social_auth/backends/contrib/vkontakte.py b/social_auth/backends/contrib/vkontakte.py index c23747c..0e4ad2a 100644 --- a/social_auth/backends/contrib/vkontakte.py +++ b/social_auth/backends/contrib/vkontakte.py @@ -5,9 +5,6 @@ This contribution adds support for VKontakte OpenAPI and OAuth 2.0 service in th www.vkontakte.ru. Username is retrieved from the identity returned by server. """ -import logging -logger = logging.getLogger(__name__) - from django.contrib.auth import authenticate from django.utils import simplejson @@ -17,7 +14,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 +from social_auth.utils import setting, log # Vkontakte configuration VK_AUTHORIZATION_URL = 'http://oauth.vk.com/authorize' @@ -246,7 +243,7 @@ def vkontakte_api(method, data): try: return simplejson.load(urlopen(url)) except (TypeError, KeyError, IOError, ValueError, IndexError): - logger.error('Could not load data from VKontakte.', exc_info=True, extra=dict(data=data)) + log('error', 'Could not load data from VKontakte.', exc_info=True, extra=dict(data=data)) return None # Backend definition diff --git a/social_auth/backends/contrib/yandex.py b/social_auth/backends/contrib/yandex.py index edd6477..7f519f1 100644 --- a/social_auth/backends/contrib/yandex.py +++ b/social_auth/backends/contrib/yandex.py @@ -6,11 +6,8 @@ openid.yandex.ru/user. Username is retrieved from the identity url. If username is not specified, OpenID 2.0 url used for authentication. """ -import logging from django.utils import simplejson -logger = logging.getLogger(__name__) - from urllib import urlencode, unquote from urllib2 import urlopen from urlparse import urlparse, urlsplit @@ -18,7 +15,7 @@ from urlparse import urlparse, urlsplit from social_auth.backends import OpenIDBackend, OpenIdAuth, USERNAME,\ OAuthBackend, BaseOAuth2 -from social_auth.utils import setting +from social_auth.utils import setting, log # Yandex configuration YANDEX_AUTHORIZATION_URL = 'https://oauth.yandex.ru/authorize' @@ -113,7 +110,7 @@ class YaruAuth(BaseOAuth2): try: return simplejson.load(urlopen(url)) except (ValueError, IndexError): - logger.error('Could not load data from Yandex.', exc_info=True, extra=dict(data=params)) + log('error', 'Could not load data from Yandex.', exc_info=True, extra=dict(data=params)) return None -- 2.39.5