proper update regarding last commit

This commit is contained in:
Miroslav Stampar 2011-03-29 22:10:08 +00:00
parent 850328df6c
commit dd01d66f13
3 changed files with 2 additions and 3 deletions

View File

@ -30,7 +30,6 @@ from lib.core.common import pushValue
from lib.core.common import randomInt from lib.core.common import randomInt
from lib.core.common import randomStr from lib.core.common import randomStr
from lib.core.common import readInput from lib.core.common import readInput
from lib.core.common import removeDynamicContent
from lib.core.common import showStaticWords from lib.core.common import showStaticWords
from lib.core.common import trimAlphaNum from lib.core.common import trimAlphaNum
from lib.core.common import wasLastRequestDBMSError from lib.core.common import wasLastRequestDBMSError

View File

@ -677,7 +677,7 @@ def readInput(message, default=None):
elif message[-1] == ']': elif message[-1] == ']':
message += " " message += " "
if conf.batch and default: if conf.batch and default is not None:
if isinstance(default, (list, tuple, set)): if isinstance(default, (list, tuple, set)):
options = ",".join([getUnicode(opt, UNICODE_ENCODING) for opt in default]) options = ",".join([getUnicode(opt, UNICODE_ENCODING) for opt in default])
else: else:

View File

@ -232,7 +232,7 @@ class Connect:
msg += "also on the redirection got from the application\n" msg += "also on the redirection got from the application\n"
while True: while True:
choice = readInput(msg, default=None) choice = readInput(msg, default="")
if not choice: if not choice:
pass pass