[Python-modules-commits] [python-social-auth] 36/89: Add SOCIAL_AUTH_EMAIL_LENGTH setting

[Wolfgang Borgert]

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

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

commit bedef0ccaece7f69afda59f41471b5bda3388fe6
Author: Tymur Maryokhin <maryokhin at gmail.com>
Date:   Sun Mar 6 00:31:06 2016 +0100

    Add SOCIAL_AUTH_EMAIL_LENGTH setting
---
 .../django_app/default/migrations/0003_alter_email_max_length.py  | 8 ++++++--
 social/apps/django_app/default/models.py                          | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/social/apps/django_app/default/migrations/0003_alter_email_max_length.py b/social/apps/django_app/default/migrations/0003_alter_email_max_length.py
index e9cb540..882c311 100644
--- a/social/apps/django_app/default/migrations/0003_alter_email_max_length.py
+++ b/social/apps/django_app/default/migrations/0003_alter_email_max_length.py
@@ -1,11 +1,15 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+from django.conf import settings
 from django.db import models, migrations
 
+from social.utils import setting_name
+
+EMAIL_LENGTH = getattr(settings, setting_name('EMAIL_LENGTH'), 254)
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
         ('default', '0002_add_related_name'),
     ]
@@ -14,6 +18,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='code',
             name='email',
-            field=models.EmailField(max_length=254),
+            field=models.EmailField(max_length=EMAIL_LENGTH),
         ),
     ]
diff --git a/social/apps/django_app/default/models.py b/social/apps/django_app/default/models.py
index 16cb3d1..9f18529 100644
--- a/social/apps/django_app/default/models.py
+++ b/social/apps/django_app/default/models.py
@@ -19,6 +19,7 @@ USER_MODEL = getattr(settings, setting_name('USER_MODEL'), None) or \
              getattr(settings, 'AUTH_USER_MODEL', None) or \
              'auth.User'
 UID_LENGTH = getattr(settings, setting_name('UID_LENGTH'), 255)
+EMAIL_LENGTH = getattr(settings, setting_name('EMAIL_LENGTH'), 254)
 NONCE_SERVER_URL_LENGTH = getattr(
     settings, setting_name('NONCE_SERVER_URL_LENGTH'), 255)
 ASSOCIATION_SERVER_URL_LENGTH = getattr(
@@ -98,7 +99,7 @@ class Association(models.Model, DjangoAssociationMixin):
 
 
 class Code(models.Model, DjangoCodeMixin):
-    email = models.EmailField(max_length=254)
+    email = models.EmailField(max_length=EMAIL_LENGTH)
     code = models.CharField(max_length=32, db_index=True)
     verified = models.BooleanField(default=False)
 

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