diff --git a/gestion/mail/installparty.py b/gestion/mail/installparty.py index f17219a2..eac4562d 100755 --- a/gestion/mail/installparty.py +++ b/gestion/mail/installparty.py @@ -21,13 +21,11 @@ ldap_filter=u'(&(|(droits=*)(&(!(chbre=EXT))(!(chbre=????))(chbre=*)(!(chbre=EXT conn=lc_ldap.shortcuts.lc_ldap_readonly() mailaddrs=set() for adh in conn.search(ldap_filter, sizelimit=2000): - # Déjà payé pour l'année en cours - if 'canonicalAlias' in adh.attrs.keys(): - mailaddrs.add(str(adh['canonicalAlias'][0])) - elif 'mail' in adh.attrs.keys(): - mailaddrs.add(str(adh['mail'][0])) - else: - raise ValueError("%r has nor mail nor canonicalAlias, only %s" % (adh, adh.attrs.keys())) + mailaddr = adh.get_mail() + if not mailaddr: + print "Skipping %r (no valid mail)" % adh + continue + mailaddrs.add(mailaddr) print "Va envoyer le message à %s personnes." % len(mailaddrs) if not SEND: