From 81eddeb0ffa470150e5cf09f43361c59031b0940 Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Tue, 8 Oct 2013 10:14:56 +0200 Subject: [PATCH] =?UTF-8?q?[mail]=20Le=20corps=20est=20encod=C3=A9=20dans?= =?UTF-8?q?=20la=20fonction=20de=20g=C3=A9n=C3=A9ration,=20pas=20besoin=20?= =?UTF-8?q?de=20le=20refaire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gestion/chambres_vides.py | 2 +- surveillance/deconnexion.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/gestion/chambres_vides.py b/gestion/chambres_vides.py index 7fff63e2..3b49dd57 100755 --- a/gestion/chambres_vides.py +++ b/gestion/chambres_vides.py @@ -76,7 +76,7 @@ for clandestin in bad_boys_e_s: if DEBUG: print mail mailer = os.popen("/usr/sbin/sendmail -t", "w") - mailer.write(mail.encode("utf-8") + "\n.") + mailer.write(mail + "\n.") mailer.close() else: diff --git a/surveillance/deconnexion.py b/surveillance/deconnexion.py index 2d729f7b..d3c0ce41 100755 --- a/surveillance/deconnexion.py +++ b/surveillance/deconnexion.py @@ -240,7 +240,6 @@ for elupload, eltype, elid in uploadeurs: mail = connectsmtp() corps = mail_module.generate('upload_hard', {'from': upload.expediteur, 'to': proprio.email(), 'upload': elupload, 'proprio': proprio.Nom(), 'lang_info':'English version below'}).as_string() - corps = corps.encode('utf-8') mail.sendmail(upload.expediteur, proprio.email(), corps) # On envoie un mail à disconnect @@ -299,7 +298,6 @@ for elupload, eltype, elid in uploadeurs: mail = connectsmtp() corps = mail_module.generate('upload_soft', {'from': upload.expediteur, 'to': proprio.email(), 'upload': elupload, 'proprio': proprio.Nom(), 'lang_info':'English version below'}).as_string() - corps = corps.encode('utf-8') mail.sendmail(upload.expediteur, proprio.email(), corps) # On envoie un mail à disconnect