Skip to content

Commit f6fa699

Browse files
committed
Fix MultiEmailField to use validate_email for validation
- Legacy-Id: 6835
1 parent 58afa08 commit f6fa699

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

ietf/utils/fields.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
from django import forms
2-
from django.forms.util import ValidationError
3-
from django.core.validators import email_re
2+
from django.core.validators import validate_email, ValidationError
43

54

65
class MultiEmailField(forms.CharField):
76
widget = forms.widgets.Textarea
87

98
def clean(self, value):
109
super(MultiEmailField, self).clean(value)
11-
if value:
12-
if value.endswith(','):
13-
value = value[:-1]
14-
emails = map(unicode.strip, value.split(','))
15-
else:
10+
if not value:
1611
return value
1712

13+
if value.endswith(','):
14+
value = value[:-1]
15+
emails = [v.strip() for v in value.split(',') if v.strip()]
16+
1817
for email in emails:
19-
if not email_re.match(email):
18+
try:
19+
validate_email(email)
20+
except ValidationError:
2021
raise ValidationError("This is not a valid comma separated email list.")
2122

2223
return value

0 commit comments

Comments
 (0)