From d58b92b957ad12f4a101fc7f082ab00dfac08dea Mon Sep 17 00:00:00 2001 From: Daniel STAN Date: Sun, 25 Oct 2015 15:11:53 +0100 Subject: [PATCH] deconnexion2: ne caste plus get_mail() en unicode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit S'il existe un mail valide, c'est déjà un unicode, sinon, c'est None, et il ne faut pas le transformer en u"None". --- surveillance/deconnexion2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/surveillance/deconnexion2.py b/surveillance/deconnexion2.py index 4aa77bd6..89d3143e 100755 --- a/surveillance/deconnexion2.py +++ b/surveillance/deconnexion2.py @@ -227,7 +227,7 @@ def upload_hard(proprio, elupload, elid, eltype, curseur, ldap): mail_data = { 'from': upload.expediteur, - 'to': unicode(proprio.get_mail()), + 'to': proprio.get_mail(), 'upload': "%.2f" % (elupload,), 'proprio': proprio, 'lang_info': 'English version below', @@ -325,7 +325,7 @@ def upload_soft(proprio, elupload, elid, eltype, curseur): with mail_module.ServerConnection() as smtp_connect: mail_data = { 'from': upload.expediteur, - 'to': unicode(proprio.get_mail()), + 'to': proprio.get_mail(), 'upload': "%.2f" % (elupload,), 'proprio': proprio, 'lang_info':'English version below',