[Python-modules-commits] [python-social-auth] 07/322: Fix custom user model migrations for Django 1.7

[Wolfgang Borgert]

This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to tag v0.2.10
in repository python-social-auth.

commit a9c44398d2294bb8f947d17870f42515679df2fc
Author: John Lynn <jlynn at hearsaycorp.com>
Date:   Sun Oct 26 11:10:26 2014 -0400

    Fix custom user model migrations for Django 1.7
    
    UserSocialAuth migration was depending on user.Auth by default and not
    using the user model specified by SOCIAL_AUTH_USER_MODEL
---
 social/apps/django_app/default/migrations/0001_initial.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/social/apps/django_app/default/migrations/0001_initial.py b/social/apps/django_app/default/migrations/0001_initial.py
index eaa7e40..fdbad18 100644
--- a/social/apps/django_app/default/migrations/0001_initial.py
+++ b/social/apps/django_app/default/migrations/0001_initial.py
@@ -5,12 +5,16 @@ from django.db import models, migrations
 import social.apps.django_app.default.fields
 from django.conf import settings
 import social.storage.django_orm
+from social.utils import setting_name
 
+user_model = getattr(settings, setting_name('USER_MODEL'), None) or \
+             getattr(settings, 'AUTH_USER_MODE', None) or \
+             'auth.User'
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        migrations.swappable_dependency(user_model),
     ]
 
     operations = [
@@ -75,7 +79,7 @@ class Migration(migrations.Migration):
                 ('extra_data', social.apps.django_app.default.fields.JSONField(
                     default=b'{}')),
                 ('user', models.ForeignKey(
-                    related_name='social_auth', to=settings.AUTH_USER_MODEL)),
+                    related_name='social_auth', to=user_model)),
             ],
             options={
                 'db_table': 'social_auth_usersocialauth',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-social-auth.git