From be346afc2138dcf7467e283543a3a20527972ef2 Mon Sep 17 00:00:00 2001 From: Nicolas Dandrimont Date: Fri, 25 Jun 2010 17:33:21 +0200 Subject: [PATCH] =?UTF-8?q?[autostatus]=20G=C3=A9n=C3=A9ration=20correcte?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit darcs-hash:20100625153321-ffbb2-e79612d4e3b76b06b87deff6cebd709e8377abd3.gz --- gestion/gen_confs/autostatus.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gestion/gen_confs/autostatus.py b/gestion/gen_confs/autostatus.py index a58bb3fc..f3e98aed 100644 --- a/gestion/gen_confs/autostatus.py +++ b/gestion/gen_confs/autostatus.py @@ -40,7 +40,6 @@ class autostatus(gen_config) : "reboot-default.crans.org", "minigiga.adm.crans.org", "newldap.adm.crans.org", - "o2.crans.org", "ytrap-llatsni.crans.org", "pegase.adm.crans.org", @@ -313,11 +312,14 @@ class autostatus(gen_config) : dico['bornes'] = self.make_config(bornes) dico['serveurs'] = self.make_config(serveurs) dico['ferme'] = self.make_config(ferme) - dico['route'] = route_to_ext.encode('iso-8859-15') + dico['route'] = route_to_ext dico['exterieur'] = self.make_config(services_exterieurs) + for item in dico: + dico[item] = dico[item].decode('utf-8') + # on écrit dans le fichier de configuration - file.write( self.matrice % dico ) + file.write( (self.matrice % dico).encode('iso-8859-15') ) # on ferme le fichier file.close()