diff options
| author | Gabe <redhatrises@gmail.com> | 2015-10-29 07:37:36 -0600 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2015-10-29 18:02:01 +0100 |
| commit | 9ffb3882532436dfd475831ee74b06e1b785251f (patch) | |
| tree | 93b4c1f33bdb2636ef99972d8753fbff0ef996d7 /ipapython | |
| parent | 4ec8df27392b4f47c03c2cded26d6695d8c38186 (diff) | |
| download | freeipa-9ffb3882532436dfd475831ee74b06e1b785251f.tar.gz freeipa-9ffb3882532436dfd475831ee74b06e1b785251f.tar.xz freeipa-9ffb3882532436dfd475831ee74b06e1b785251f.zip | |
interactive installer does not ignore leading/trailing whitespace
https://fedorahosted.org/freeipa/ticket/5355
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipapython')
| -rw-r--r-- | ipapython/ipautil.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py index b6fd11338..4acdd1a98 100644 --- a/ipapython/ipautil.py +++ b/ipapython/ipautil.py @@ -763,7 +763,7 @@ def user_input(prompt, default = None, allow_empty = True): try: ret = input("%s: " % prompt) if allow_empty or ret.strip(): - return ret + return ret.strip() except EOFError: if allow_empty: return '' @@ -776,7 +776,7 @@ def user_input(prompt, default = None, allow_empty = True): if not ret and (allow_empty or default): return default elif ret.strip(): - return ret + return ret.strip() except EOFError: return default @@ -785,6 +785,7 @@ def user_input(prompt, default = None, allow_empty = True): while True: try: ret = input("%s [%s]: " % (prompt, choice)) + ret = ret.strip() if not ret: return default elif ret.lower()[0] == "y": @@ -798,6 +799,7 @@ def user_input(prompt, default = None, allow_empty = True): while True: try: ret = input("%s [%s]: " % (prompt, default)) + ret = ret.strip() if not ret: return default ret = int(ret) |