From fc58eaff92bbebc11887751922ac8459ce6e44b4 Mon Sep 17 00:00:00 2001 From: Daniel STAN Date: Wed, 24 Sep 2014 23:35:52 +0200 Subject: [PATCH] reinscription: utilise get_mail de lc_ldap --- gestion/mail/reinscription.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gestion/mail/reinscription.py b/gestion/mail/reinscription.py index 835d1b1c..61f25e64 100755 --- a/gestion/mail/reinscription.py +++ b/gestion/mail/reinscription.py @@ -26,18 +26,14 @@ for adh in conn.search(ldap_filter): # Déjà payé pour l'année en cours if adh.paiement_ok(): continue - 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())) + addr = adh.get_mail() + if addr: + mailaddrs.add(addr) -print "Va envoyer le message à %s personnes." +print "Va envoyer le message à %s personnes." % len(mailaddrs) if not SEND: - print "(Simulation only) Mettre la variable SEND à True effectuer l'envoi" % len(mailaddrs) + print "(Simulation only) Mettre la variable SEND à True effectuer l'envoi" print "Appuyer sur une touche pour continuer." -raw_input() echecs=[] conn_smtp=smtplib.SMTP('smtp.adm.crans.org')