From 9972a5464a65b67501c5af8bfb90d0c80ca2bc29 Mon Sep 17 00:00:00 2001 From: Ryan Cross Date: Tue, 9 May 2017 23:28:35 +0000 Subject: [PATCH] Fixes #2002. Trailing comma in Liaison cc_contacts field causes invalid email address error. Commit ready for merge. - Legacy-Id: 13292 --- ietf/liaisons/forms.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ietf/liaisons/forms.py b/ietf/liaisons/forms.py index f77da410e..7d055de07 100644 --- a/ietf/liaisons/forms.py +++ b/ietf/liaisons/forms.py @@ -102,6 +102,7 @@ def validate_emails(value): value = value.strip() # strip whitespace if '\r\n' in value: # cc_contacts has newlines value = value.replace('\r\n',',') + value = value.rstrip(',') # strip trailing comma emails = value.split(',') for email in emails: name, addr = parseaddr(email) @@ -277,7 +278,9 @@ class LiaisonModelForm(BetterModelForm): def clean_cc_contacts(self): '''Return a comma separated list of addresses''' cc_contacts = self.cleaned_data.get('cc_contacts') - return cc_contacts.replace('\r\n',',') + cc_contacts = cc_contacts.replace('\r\n',',') + cc_contacts = cc_contacts.rstrip(',') + return cc_contacts def clean(self): if not self.cleaned_data.get('body', None) and not self.has_attachments():