[affich_tools] on arrete de [mal] forcer l'iso

darcs-hash:20090618124505-bd074-b6866d6f33fa647b3261ff4b3f93a29f3b27abf8.gz
This commit is contained in:
Antoine Durand-Gasselin 2009-06-18 14:45:05 +02:00
parent ad6f45aba2
commit 8e5b88de7d

View file

@ -42,8 +42,8 @@ def dialog(backtitle,arg,dialogrc='') :
si erreur dans les arguments raise RuntimeError
"""
f = tempfile.NamedTemporaryFile()
cmd = u'%s LANG=fr_FR@euro /usr/bin/dialog --backtitle "%s" --cancel-label "Retour" %s 2>%s' % (dialogrc, backtitle,arg,f.name)
res = os.system(cmd.encode('iso-8859-15','ignore'))
cmd = u'%s /usr/bin/dialog --backtitle "%s" --cancel-label "Retour" %s 2>%s' % (dialogrc, backtitle,arg,f.name)
res = os.system(cmd.encode(encoding, 'ignore'))
if res == 256 :
# Annuler
@ -51,8 +51,10 @@ def dialog(backtitle,arg,dialogrc='') :
return [ 1, [] ]
# Lecture du fichier de résultat et effacement
try:
result=f.readlines()
result= [ line.decode(encoding) for line in f.readlines() ]
f.close()
except UnicodeDecodeErrors, e:
raise e
except :
result = [ "n'importe quoi", '']
res = 65280
@ -65,7 +67,7 @@ def dialog(backtitle,arg,dialogrc='') :
arg1 = u'--title "Annulation" --yesno "Quitter ?\nLes dernières modifications seront perdues." 6 48'
print backtitle
cmd = u'%s /usr/bin/dialog --backtitle "%s" %s' % (dialogrc, backtitle,arg1)
res = os.system(cmd.encode('iso-8859-15','ignore') )
res = os.system(cmd.encode(encoding ,'ignore') )
if res==0 : sys.exit(0)
else : return dialog(backtitle,arg)
elif not result : result=['']