greater flexibility for --batch when default is None

stamparm · stamparm · commit 83feb097ef0a · 2011-04-08T22:29:50.000Z
diff --git 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
@@ -232,7 +232,7 @@ def getPage(**kwargs):
                 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
