From 83feb097ef0a5c812912239c487609192bcc9708 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Fri, 8 Apr 2011 22:29:50 +0000
Subject: [PATCH] greater flexibility for --batch when default is None

---
 lib/core/common.py     | 6 ++++--
 lib/request/connect.py | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/core/common.py b/lib/core/common.py
index 787b5d50e..4a16b2e05 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -679,11 +679,13 @@ def readInput(message, default=None):
     elif message[-1] == ']':
         message += " "
 
-    if conf.batch and default is not None:
+    if conf.batch:
         if isinstance(default, (list, tuple, set)):
             options = ",".join([getUnicode(opt, UNICODE_ENCODING) for opt in default])
-        else:
+        elif default:
             options = getUnicode(default, UNICODE_ENCODING)
+        else:
+            options = unicode()
 
         infoMsg = "%s%s" % (message, options)
         logger.info(infoMsg)
diff --git a/lib/request/connect.py b/lib/request/connect.py
index 344e2ef13..9fb32e43b 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="")
+                    choice = readInput(msg, default=None)
 
                     if not choice:
                         pass