From 0918366bb86ca33c012b32daf54f2a35aaba0cf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= Date: Tue, 1 Dec 2015 02:26:56 +0100 Subject: [PATCH] =?UTF-8?q?Utilisation=20de=20l'encodage=20trouv=C3=A9=20d?= =?UTF-8?q?ans=20config=20(et=20drop=20de=20la=20variable=20locale)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gestion/chgpass.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gestion/chgpass.py b/gestion/chgpass.py index ed6e2d3f..d5a109e9 100755 --- a/gestion/chgpass.py +++ b/gestion/chgpass.py @@ -25,7 +25,6 @@ import lc_ldap.attributs import lc_ldap.objets import gestion.mail as mail_module -encoding = getattr(sys.stdout, 'encoding', "UTF-8") current_user = os.getenv("SUDO_USER") or os.getenv("USER") or os.getenv("LOGNAME") or getpass.getuser() def check_password(password, no_cracklib=False, dialog=False): @@ -101,7 +100,7 @@ def check_password(password, no_cracklib=False, dialog=False): msg = affich_tools.coul(msg, 'rouge', dialog=dialog) return True, msg except ValueError as e: - msg += str(e).decode('utf-8') + msg += str(e).decode(config.in_encoding) if dialog: msg = affich_tools.coul(msg, 'rouge', dialog=dialog) @@ -127,7 +126,7 @@ def change_password(ldap, login=None, verbose=False, no_cracklib=False, **args): if login is None: login = current_user if type(login) == str: - login = login.decode(encoding) + login = login.decode(config.in_encoding) login = lc_ldap.crans_utils.escape(login) query = ldap.search(u"(uid=%s)" % login, mode="w") if not query: @@ -139,7 +138,7 @@ def change_password(ldap, login=None, verbose=False, no_cracklib=False, **args): user['userPassword'] = [lc_ldap.crans_utils.hash_password("test").decode('ascii')] user.cancel() except EnvironmentError as e: - affich_tools.cprint(str(e).decode(encoding), "rouge") + affich_tools.cprint(str(e).decode(config.in_encoding), "rouge") # Génération d'un mail From = 'roots@crans.org' @@ -149,7 +148,7 @@ To: %s Subject: Tentative de changement de mot de passe ! Tentative de changement du mot de passe de %s par %s. -""" % (From, To , login.encode(encoding), current_user) +""" % (From, To , login.encode(config.out_encoding), current_user) # Envoi mail with mail_module.ServerConnection() as conn: