[dialogwizard/dialogwizard] on prefere utiliser une methode generique pour verifier que l'appel a dialog s'est bien effectue

Ignore-this: 4323b4c019e56d8381587b82e183908d

darcs-hash:20090825144204-bd074-c765bda3efeedadc05914be0937530b27025cb33.gz
This commit is contained in:
Antoine Durand-Gasselin 2009-08-25 16:42:04 +02:00
parent 63bdff02a0
commit 0d44a363eb
2 changed files with 11 additions and 9 deletions

View file

@ -21,12 +21,15 @@ class DialogStepGenerator():
self.d = dialog.Dialog()
self.d.add_persistent_args(["--backtitle", backtitle])
def form_step(self, title, enonce, form):
def _check_rc(self, rc):
if rc == 2: really_quit(dico)
if rc == 1: raise PreviousStep
def form_step(self, title, enonce, form, **kw):
def fn(dico, default):
fields = [ ( field[1], default.get(field[0], dico.get(field[0], ''))) + field[2:] for field in form ]
rc, res = self.d.form(enonce, fields = fields, title=title)
if rc == 2: really_quit(dico)
if rc == 1: raise PreviousStep
rc, res = self.d.form(enonce, fields = fields, title=title, **kw)
self._check_rc(rc)
for field, val in izip (form, res):
dico[field[0]] = val
return dico
@ -34,9 +37,8 @@ class DialogStepGenerator():
def select_step(self, title, enonce, var, choix):
def fn(dico, default):
rc, res = self.d.menu(enonce, choices = choix, title = title)
if rc == 2: really_quit(dico)
if rc == 1: raise PreviousStep
rc, res = self.d.inputbox(enonce, title = title, init = dico.get(var, ''), **kw)
self._check_rc(rc)
dico[var] = res
return dico
return Step(fn)