Attachment 584687 Details for Bug 818184 – commandLineUI patch requiring answer to be one of the options

[patch] commandLineUI patch requiring answer to be one of the options

commandLineUI.patch (text/plain), 984 bytes, created by Greg Nichols on 2012-05-15 15:08:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2012-05-15 15:08:58 UTC

Size: 984 bytes

patch

obsolete

>Index: commandLineUI.py
>===================================================================
>--- commandLineUI.py	(revision 1218)
>+++ commandLineUI.py	(working copy)
>@@ -85,11 +85,16 @@
>             label += " ("
>             label += "|".join(answers)
>             label += ") "
>-        readline.set_startup_hook(lambda: readline.insert_text(value))
>-        try:
>-            return raw_input(label)
>-        finally:
>-            readline.set_startup_hook()
>+        while True:
>+            readline.set_startup_hook(lambda: readline.insert_text(value))
>+            try:
>+                answer = raw_input(label)
>+                if not answers or answer in answers:
>+                    return answer
>+                # otherwise
>+                print "Please enter one of the following: %s" % " | ".join(answers)
>+            finally:
>+                readline.set_startup_hook()
>             
>     def promptPassword(self, message):
>         return getpass.getpass(message)

Actions: View | Diff

Attachments on bug 818184: 584687