From dd01d66f136fd6aa393cf8246b4460d0050df4e1 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 29 Mar 2011 22:10:08 +0000 Subject: [PATCH] proper update regarding last commit --- lib/controller/checks.py | 1 - lib/core/common.py | 2 +- lib/request/connect.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/controller/checks.py b/lib/controller/checks.py index f808f8e70..c10ea351c 100644 --- a/lib/controller/checks.py +++ b/lib/controller/checks.py @@ -30,7 +30,6 @@ from lib.core.common import pushValue from lib.core.common import randomInt from lib.core.common import randomStr from lib.core.common import readInput -from lib.core.common import removeDynamicContent from lib.core.common import showStaticWords from lib.core.common import trimAlphaNum from lib.core.common import wasLastRequestDBMSError diff --git a/lib/core/common.py b/lib/core/common.py index 08ef7046d..4a1e92f3a 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -677,7 +677,7 @@ def readInput(message, default=None): elif message[-1] == ']': message += " " - if conf.batch and default: + if conf.batch and default is not None: if isinstance(default, (list, tuple, set)): options = ",".join([getUnicode(opt, UNICODE_ENCODING) for opt in default]) else: diff --git a/lib/request/connect.py b/lib/request/connect.py index a3150d27c..903a20666 100644 --- a/lib/request/connect.py +++ b/lib/request/connect.py @@ -232,7 +232,7 @@ class Connect: msg += "also on the redirection got from the application\n" while True: - choice = readInput(msg, default=None) + choice = readInput(msg, default="") if not choice: pass