From 34f322db3592855cb24b396dda2b98dc5eade62d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?= =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Fri, 27 Aug 2010 16:04:23 +0400 Subject: [PATCH] Fix dalogYesNo(). --- pym/server/utils.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pym/server/utils.py b/pym/server/utils.py index d747c95..9a3d597 100644 --- a/pym/server/utils.py +++ b/pym/server/utils.py @@ -68,20 +68,21 @@ def dialogYn(message): return res -def dialogYesNo(message): +def dialogYesNo(message, reYes=re.compile("^ye?s?$",re.I), + reNo=re.compile("^no?$",re.I)): """Вывод сообщения, ожидание набора Yes или No (в любом регистре) если Yes - True, если No - False""" #sys.stdout.write(message + ": ") #strIn=sys.stdin.readline().lower().strip() - strIn = raw_input(message + ": ") + strIn = raw_input(message + ": ") sys.stdout.write("\n") - if "yes" == strIn: + if reYes.match(strIn): return True - elif "no" == strIn: + elif reNo.match(strIn): return False else: - return dialogYesNo(message) + return dialogYesNo(message, reYes, reNo) def rawInput(promptText="", inputText=""): """Создает поле ввода