mail_impression_ok: nettoie les import
Et réordonne pour ne plus avoir de warnings :/
This commit is contained in:
parent
d5811da81d
commit
1734305716
1 changed files with 11 additions and 15 deletions
|
@ -2,23 +2,19 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
import BeautifulSoup
|
||||
import sys
|
||||
import requests
|
||||
import re
|
||||
import datetime
|
||||
import time
|
||||
import impression.digicode as digicode
|
||||
from lc_ldap import shortcuts
|
||||
import lc_ldap.crans_utils as crans_utils
|
||||
import gestion.config as config
|
||||
import gestion.affichage as affichage
|
||||
|
||||
import sys
|
||||
import smtplib
|
||||
from gestion import config
|
||||
|
||||
from gestion.affich_tools import cprint
|
||||
from gestion import mail
|
||||
import lc_ldap.shortcuts
|
||||
from utils.sendmail import actually_sendmail
|
||||
from lc_ldap import shortcuts
|
||||
import impression.digicode as digicode
|
||||
|
||||
URL_JOBLIST = 'https://imprimante.adm.crans.org/hp/device/JobLogReport/Index'
|
||||
CA = '/etc/ssl/certs/cacert.org.pem'
|
||||
|
@ -67,7 +63,7 @@ for job in jobs:
|
|||
success[name] = {'task': []}
|
||||
success[name]['task'].append(task)
|
||||
#print repr((name, task))
|
||||
#print name
|
||||
#print name
|
||||
|
||||
#Section consacrée à l'envoi : partie 1 pour les adh, partie 2 pour les clubs
|
||||
#To = 'detraz@crans.org'
|
||||
|
@ -83,8 +79,8 @@ for name in success:
|
|||
To = name + u'@crans.org'
|
||||
tname = unicode(adh['prenom'][0]) + " " + unicode(adh['nom'][0])
|
||||
codes = [x[0] + u'#' for x in digicode.list_code(name)]
|
||||
if not codes:
|
||||
codes = [digicode.gen_code(name) + u'#']
|
||||
if not codes:
|
||||
codes = [digicode.gen_code(name) + u'#']
|
||||
#cprint(u"Envoi du mail à %s" % To)
|
||||
mailtxt=mail.generate('mail_impression_ok', {
|
||||
'To': To,
|
||||
|
@ -95,7 +91,7 @@ for name in success:
|
|||
})
|
||||
#print mailtxt.as_string()
|
||||
actually_sendmail(From, (To,), mailtxt)
|
||||
else:
|
||||
else:
|
||||
e = e+1
|
||||
|
||||
for club in clubs:
|
||||
|
@ -104,7 +100,7 @@ for club in clubs:
|
|||
To = club + u'@crans.org'
|
||||
codes = [x[0] + u'#' for x in digicode.list_code(club)]
|
||||
if not codes:
|
||||
codes = [digicode.gen_code(club) + u'#']
|
||||
codes = [digicode.gen_code(club) + u'#']
|
||||
#cprint(u"Envoi du mail à %s" % To)
|
||||
mailtxt=mail.generate('mail_impression_ok', {
|
||||
'To': To,
|
||||
|
@ -114,12 +110,12 @@ for club in clubs:
|
|||
'codes': u', '.join(codes),
|
||||
})
|
||||
#print mailtxt.as_string()
|
||||
actually_sendmail(From, (To,), mailtxt)
|
||||
#actually_sendmail(From, (To,), mailtxt)
|
||||
|
||||
if e>0:
|
||||
print "Des problèmes sont survenus entre %s et %s" % (debut, fin)
|
||||
print "Nombre total de mails envoyés :"
|
||||
print a
|
||||
print "Nombre de mails non envoyés faute de résultats LDAP :"
|
||||
print "Nombre de mails non envoyés faute de résultats LDAP :"
|
||||
print e
|
||||
#print len(success)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue