From cf4cbf76f36cbe36ebd26e0abfd37fd81fa6a4dc Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sun, 18 Oct 2015 12:14:30 +0000 Subject: [PATCH] Reverted mixed merge. - Legacy-Id: 10230 --- ietf/mailtrigger/models.py | 17 ++--------------- ietf/utils/test_utils.py | 4 +++- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/ietf/mailtrigger/models.py b/ietf/mailtrigger/models.py index ac4ecc36c..6a6b1d17e 100644 --- a/ietf/mailtrigger/models.py +++ b/ietf/mailtrigger/models.py @@ -3,22 +3,8 @@ from django.db import models from django.template import Template, Context -from email.utils import parseaddr - from ietf.group.models import Role -def clean_duplicates(addrlist): - retval = set() - for a in addrlist: - (name,addr) = parseaddr(a) - if (name,addr)==('',''): - retval.add(a) - elif name: - retval.add('"%s" <%s>'%(name,addr)) - else: - retval.add(addr) - return list(retval) - class MailTrigger(models.Model): slug = models.CharField(max_length=32, primary_key=True) desc = models.TextField(blank=True) @@ -51,7 +37,8 @@ class Recipient(models.Model): if rendering: retval.extend([x.strip() for x in rendering.split(',')]) - return clean_duplicates(retval) + retval = list(set(retval)) + return retval def gather_doc_group_chairs(self, **kwargs): addrs = [] diff --git a/ietf/utils/test_utils.py b/ietf/utils/test_utils.py index 9f296df8c..c500cc05f 100644 --- a/ietf/utils/test_utils.py +++ b/ietf/utils/test_utils.py @@ -41,9 +41,11 @@ import urllib2 as urllib from difflib import unified_diff import django.test -from django.db import connection +from django.db import connection, connections, DEFAULT_DB_ALIAS +from django.test.testcases import connections_support_transactions from django.test.client import Client from django.conf import settings +from django.core.management import call_command import debug # pyflakes:ignore