Merge pull request #290 from elnappo/upgrade_social

upgrade python-social-auth

.gitignore

@@ -8,4 +8,3 @@ local_settings.py
 *.sqlite
 *.egg-info
 dist/
-

nsupdate/settings/base.py

@@ -122,14 +122,16 @@
                 # 'django.template.context_processors.debug',
                 'django.template.context_processors.i18n',
                 'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
                 'nsupdate.context_processors.add_settings',
                 'nsupdate.context_processors.update_ips',
                 # 'django.template.context_processors.media',
                 # 'django.template.context_processors.static',
                 # 'django.template.context_processors.tz',
                 # 'django.contrib.messages.context_processors.messages',
-                'social.apps.django_app.context_processors.backends',
-                'social.apps.django_app.context_processors.login_redirect',
+                'social_django.context_processors.backends',
+                'social_django.context_processors.login_redirect',
+
             ],
             'loaders': [
                 'django.template.loaders.filesystem.Loader',
@@ -146,7 +148,7 @@
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-    'social.apps.django_app.middleware.SocialAuthExceptionMiddleware',
+    'social_django.middleware.SocialAuthExceptionMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
 
@@ -163,7 +165,7 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.humanize',
-    'social.apps.django_app.default',
+    'social_django',
     'nsupdate.login',
     'nsupdate',
     'nsupdate.accounts',
@@ -265,16 +267,16 @@
 # python-social-auth settings
 
 AUTHENTICATION_BACKENDS = (
-    'social.backends.amazon.AmazonOAuth2',
-    'social.backends.bitbucket.BitbucketOAuth',
-    'social.backends.disqus.DisqusOAuth2',
-    'social.backends.dropbox.DropboxOAuth',
-    'social.backends.github.GithubOAuth2',
-    'social.backends.google.GoogleOAuth2',
-    'social.backends.reddit.RedditOAuth2',
-    'social.backends.soundcloud.SoundcloudOAuth2',
-    'social.backends.stackoverflow.StackoverflowOAuth2',
-    'social.backends.twitter.TwitterOAuth',
+    'social_core.backends.amazon.AmazonOAuth2',
+    'social_core.backends.bitbucket.BitbucketOAuth',
+    'social_core.backends.disqus.DisqusOAuth2',
+    'social_core.backends.dropbox.DropboxOAuth',
+    'social_core.backends.github.GithubOAuth2',
+    'social_core.backends.google.GoogleOAuth2',
+    'social_core.backends.reddit.RedditOAuth2',
+    'social_core.backends.soundcloud.SoundcloudOAuth2',
+    'social_core.backends.stackoverflow.StackoverflowOAuth2',
+    'social_core.backends.twitter.TwitterOAuth',
     'django.contrib.auth.backends.ModelBackend',
 )
 

nsupdate/urls.py

@@ -22,7 +22,7 @@ def remember_me_login(request, *args, **kw):
 
 urlpatterns = patterns(
     '',
-    url('', include('social.apps.django_app.urls', namespace='social')),
+    url('', include('social_django.urls', namespace='social')),
     url(r'^accounts/', include('nsupdate.login.urls')),
     # registration and user settings
     url(r'^account/', include('nsupdate.accounts.urls')),

requirements.d/all.txt

@@ -5,5 +5,5 @@ django>=1.8.1, <1.9
 django-bootstrap-form
 django-registration-redux<1.2
 django-extensions
-python-social-auth
+social-auth-app-django
 requests