From 4e305ed00338fc93e8e9bfd9759dc7aa1bc061b4 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 11 Mar 2015 10:21:04 +0100 Subject: [PATCH] Coding style fixes. --- modoboa/extensions/webmail/forms.py | 3 ++- modoboa/extensions/webmail/validators.py | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/modoboa/extensions/webmail/forms.py b/modoboa/extensions/webmail/forms.py index 2ff9d3ff0..ac4468553 100644 --- a/modoboa/extensions/webmail/forms.py +++ b/modoboa/extensions/webmail/forms.py @@ -14,7 +14,8 @@ from .lib import ( ImapEmail, create_mail_attachment ) -from validators import validate_email_list +from .validators import validate_email_list + def html2plaintext(content): """HTML to plain text translation. diff --git a/modoboa/extensions/webmail/validators.py b/modoboa/extensions/webmail/validators.py index 8c6c25dc1..fab794a43 100644 --- a/modoboa/extensions/webmail/validators.py +++ b/modoboa/extensions/webmail/validators.py @@ -1,17 +1,20 @@ -from django.utils.encoding import force_text -from django.utils.deconstruct import deconstructible -from django.core.validators import validate_email +"""Custom form validators.""" + from email.utils import getaddresses +from django.utils.encoding import force_text +from django.core.validators import validate_email + + class EmailListValidator(object): - """ - Validate a comma separated list of email - """ + + """Validate a comma separated list of email.""" + def __call__(self, value): value = force_text(value) - emails = map(unicode.strip, value.split(',')) + emails = [unicode.strip(email) for email in value.split(",")] addresses = getaddresses(emails) - [ validate_email(e) for r, e in addresses ] + [validate_email(e) for r, e in addresses.values] validate_email_list = EmailListValidator()