Clean imports

diff --git a/social_auth/backends/__init__.py b/social_auth/backends/__init__.py
index 5a3e8384b940450e66948db6a8f62a508661cbaf..bd80bd388bd7af55208f91f222452b0ff9a8da10 100644 (file)
--- a/social_auth/backends/__init__.py
+++ b/social_auth/backends/__init__.py
@@ -14,7 +14,6 @@ logger = logging.getLogger(__name__)
 
 from os import walk
 from os.path import basename
-from uuid import uuid4
 from urllib2 import Request, urlopen
 from urllib import urlencode
 from urlparse import urlsplit
@@ -33,8 +32,8 @@ from django.utils import simplejson
 from django.utils.importlib import import_module
 
 from social_auth.models import UserSocialAuth
+from social_auth.utils import setting
 from social_auth.store import DjangoOpenIDStore
-from social_auth.signals import pre_update, socialauth_registered
 from social_auth.backends.exceptions import StopPipeline
 
 
@@ -64,24 +63,8 @@ SESSION_NAME = 'openid'
 # key for username in user details dict used around, see get_user_details
 # method
 USERNAME = 'username'
-# get User class, could not be auth.User
-User = UserSocialAuth._meta.get_field('user').rel.to
-# username field max length
-USERNAME_MAX_LENGTH = User._meta.get_field(USERNAME).max_length
-
-# a few settings values
-def _setting(name, default=None):
-    return getattr(settings, name, default)
-
-CREATE_USERS = _setting('SOCIAL_AUTH_CREATE_USERS', True)
-ASSOCIATE_BY_MAIL = _setting('SOCIAL_AUTH_ASSOCIATE_BY_MAIL', False)
-LOAD_EXTRA_DATA = _setting('SOCIAL_AUTH_EXTRA_DATA', True)
-FORCE_RANDOM_USERNAME = _setting('SOCIAL_AUTH_FORCE_RANDOM_USERNAME', False)
-USERNAME_FIXER = _setting('SOCIAL_AUTH_USERNAME_FIXER', lambda u: u)
-DEFAULT_USERNAME = _setting('SOCIAL_AUTH_DEFAULT_USERNAME')
-CHANGE_SIGNAL_ONLY = _setting('SOCIAL_AUTH_CHANGE_SIGNAL_ONLY', False)
-UUID_LENGHT = _setting('SOCIAL_AUTH_UUID_LENGTH', 16)
-PIPELINE = _setting('SOCIAL_AUTH_PIPELINE', (
+
+PIPELINE = setting('SOCIAL_AUTH_PIPELINE', (
                 'social_auth.backends.pipeline.social.social_auth_user',
                 'social_auth.backends.pipeline.associate.associate_by_email',
                 'social_auth.backends.pipeline.user.get_username',
@@ -197,7 +180,7 @@ class OAuthBackend(SocialAuthBackend):
         extra_data field"""
         data = {'access_token': response.get('access_token', '')}
         name = self.name.replace('-', '_').upper()
-        names = (self.EXTRA_DATA or []) + _setting(name + '_EXTRA_DATA', [])
+        names = (self.EXTRA_DATA or []) + setting(name + '_EXTRA_DATA', [])
         data.update((alias, response.get(name)) for name, alias in names)
         return data
 
@@ -276,8 +259,8 @@ class OpenIDBackend(SocialAuthBackend):
         SREG_ATTR, OLD_AX_ATTRS or AX_SCHEMA_ATTRS
         """
         name = self.name.replace('-', '_').upper()
-        sreg_names = _setting(name + '_SREG_EXTRA_DATA')
-        ax_names = _setting(name + '_AX_EXTRA_DATA')
+        sreg_names = setting(name + '_SREG_EXTRA_DATA')
+        ax_names = setting(name + '_AX_EXTRA_DATA')
         data = self.values_from_response(response, sreg_names, ax_names)
         return data
 
@@ -358,8 +341,8 @@ class OpenIdAuth(BaseAuth):
 
     def trust_root(self):
         """Return trust-root option"""
-        return _setting('OPENID_TRUST_ROOT',
-                        self.request.build_absolute_uri('/'))
+        return setting('OPENID_TRUST_ROOT') or \
+               self.request.build_absolute_uri('/'))
 
     def auth_complete(self, *args, **kwargs):
         """Complete auth process"""
@@ -524,8 +507,8 @@ class ConsumerBasedOAuth(BaseOAuth):
         """Return tuple with Consumer Key and Consumer Secret for current
         service provider. Must return (key, secret), order *must* be respected.
         """
-        return _setting(self.SETTINGS_KEY_NAME), \
-               _setting(self.SETTINGS_SECRET_NAME)
+        return setting(self.SETTINGS_KEY_NAME), \
+               setting(self.SETTINGS_SECRET_NAME)
 
     @classmethod
     def enabled(cls):
@@ -600,19 +583,19 @@ class BaseOAuth2(BaseOAuth):
         """Return tuple with Consumer Key and Consumer Secret for current
         service provider. Must return (key, secret), order *must* be respected.
         """
-        return _setting(self.SETTINGS_KEY_NAME), \
-               _setting(self.SETTINGS_SECRET_NAME)
+        return setting(self.SETTINGS_KEY_NAME), \
+               setting(self.SETTINGS_SECRET_NAME)
 
 
 # import sources from where check for auth backends
 SOCIAL_AUTH_IMPORT_SOURCES = (
     'social_auth.backends',
     'social_auth.backends.contrib',
-) + _setting('SOCIAL_AUTH_IMPORT_BACKENDS', ())
+) + setting('SOCIAL_AUTH_IMPORT_BACKENDS', ())
 
 def get_backends():
     backends = {}
-    enabled_backends = _setting('SOCIAL_AUTH_ENABLED_BACKENDS')
+    enabled_backends = setting('SOCIAL_AUTH_ENABLED_BACKENDS')
 
     for mod_name in SOCIAL_AUTH_IMPORT_SOURCES:
         try:

diff --git a/social_auth/utils.py b/social_auth/utils.py
index 74a2a276a4c43e5e1e1eee06097ae523dc509a2d..9e3ea49073681e0af39fde95aea558ff04a2fcff 100644 (file)
--- a/social_auth/utils.py
+++ b/social_auth/utils.py
@@ -1,6 +1,8 @@
 import urlparse
 from collections import defaultdict
 
+from django.conf import settings
+
 
 def sanitize_log_data(secret, data=None, leave_characters=4):
     """
@@ -78,6 +80,11 @@ def group_backend_by_type(items, key=lambda x: x):
     return dict(result)
 
 
+def setting(name, default=None):
+    """Return setting value for given name or default value."""
+    return getattr(settings, name, default)
+
+
 if __name__ == '__main__':
     import doctest
     doctest.testmod()

diff --git a/social_auth/views.py b/social_auth/views.py
index aa69cd89f5b9068ac6d91a00875ec4f471cb3037..139cfcaf3185becfce48e076b6d2490af3795e78 100644 (file)
--- a/social_auth/views.py
+++ b/social_auth/views.py
@@ -19,28 +19,24 @@ from django.contrib.auth.decorators import login_required
 from django.views.decorators.csrf import csrf_exempt
 
 from social_auth.backends import get_backend
-from social_auth.utils import sanitize_redirect
+from social_auth.utils import sanitize_redirect, setting
 
 
-def _setting(name, default=''):
-    return getattr(settings, name, default)
-
-
-DEFAULT_REDIRECT = _setting('SOCIAL_AUTH_LOGIN_REDIRECT_URL') or \
-                   _setting('LOGIN_REDIRECT_URL')
-NEW_USER_REDIRECT = _setting('SOCIAL_AUTH_NEW_USER_REDIRECT_URL')
-NEW_ASSOCIATION_REDIRECT = _setting('SOCIAL_AUTH_NEW_ASSOCIATION_REDIRECT_URL')
-DISCONNECT_REDIRECT_URL = _setting('SOCIAL_AUTH_DISCONNECT_REDIRECT_URL')
-LOGIN_ERROR_URL = _setting('LOGIN_ERROR_URL', settings.LOGIN_URL)
-COMPLETE_URL_NAME = _setting('SOCIAL_AUTH_COMPLETE_URL_NAME', 'socialauth_complete')
-ASSOCIATE_URL_NAME = _setting('SOCIAL_AUTH_ASSOCIATE_URL_NAME',
+DEFAULT_REDIRECT = setting('SOCIAL_AUTH_LOGIN_REDIRECT_URL') or \
+                   setting('LOGIN_REDIRECT_URL')
+NEW_USER_REDIRECT = setting('SOCIAL_AUTH_NEW_USER_REDIRECT_URL')
+NEW_ASSOCIATION_REDIRECT = setting('SOCIAL_AUTH_NEW_ASSOCIATION_REDIRECT_URL')
+DISCONNECT_REDIRECT_URL = setting('SOCIAL_AUTH_DISCONNECT_REDIRECT_URL')
+LOGIN_ERROR_URL = setting('LOGIN_ERROR_URL', settings.LOGIN_URL)
+COMPLETE_URL_NAME = setting('SOCIAL_AUTH_COMPLETE_URL_NAME', 'socialauth_complete')
+ASSOCIATE_URL_NAME = setting('SOCIAL_AUTH_ASSOCIATE_URL_NAME',
                               'socialauth_associate_complete')
-SOCIAL_AUTH_LAST_LOGIN = _setting('SOCIAL_AUTH_LAST_LOGIN',
+SOCIAL_AUTH_LAST_LOGIN = setting('SOCIAL_AUTH_LAST_LOGIN',
                                   'social_auth_last_login_backend')
-SESSION_EXPIRATION = _setting('SOCIAL_AUTH_SESSION_EXPIRATION', True)
-BACKEND_ERROR_REDIRECT = _setting('SOCIAL_AUTH_BACKEND_ERROR_URL',
-                                  LOGIN_ERROR_URL)
-SANITIZE_REDIRECTS = _setting('SOCIAL_AUTH_SANITIZE_REDIRECTS', True)
+SESSION_EXPIRATION = setting('SOCIAL_AUTH_SESSION_EXPIRATION', True)
+BACKEND_ERROR_REDIRECT = setting('SOCIAL_AUTH_BACKEND_ERROR_URL',
+                                 LOGIN_ERROR_URL)
+SANITIZE_REDIRECTS = setting('SOCIAL_AUTH_SANITIZE_REDIRECTS', True)
 
 
 def dsa_view(redirect_name=None):