IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-13 01:31:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add brackets around optional parameters when prompting.

Browse Source 
ticket 832
This commit is contained in:
Rob Crittenden 2011-01-24 16:59:52 -05:00
parent 7262884706
commit 5c88225dda
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ipalib/cli.py
View File

@ -507,15 +507,19 @@ class textui(backend.Backend):
def print_error(self, text):
print ' ** %s **' % unicode(text)
def prompt(self, label, default=None, get_values=None):
def prompt(self, label, default=None, get_values=None, optional=False):
"""
Prompt user for input.
"""
# TODO: Add tab completion using readline
if default is None:
prompt = u'%s: ' % label
if optional:
prompt = u'[%s]' % label
else:
prompt = u'%s [%s]: ' % (label, default)
prompt = u'%s' % label
if default is None:
prompt = u'%s: ' % prompt
else:
prompt = u'%s [%s]: ' % (prompt, default)
try:
data = raw_input(self.encode(prompt))
except EOFError:
@ -992,7 +996,7 @@ class cli(backend.Executioner):
while True:
if error is not None:
print '>>> %s: %s' % (unicode(param.label), unicode(error))
raw = self.Backend.textui.prompt(param.label, default)
raw = self.Backend.textui.prompt(param.label, default, optional=param.alwaysask or not param.required)
try:
value = param(raw, **kw)
if value is not None: