Made expect even prettier.

This commit is contained in:
Jeremy Fincher 2003-08-28 23:03:09 +00:00
parent 1b2b18c375
commit 4763cb4daa

View File

@ -38,9 +38,10 @@ def expect(prompt, possibilities, recursed=False):
if possibilities: if possibilities:
prompt = '%s [%s]' % (originalPrompt, '/'.join(possibilities)) prompt = '%s [%s]' % (originalPrompt, '/'.join(possibilities))
if len(prompt) > 70: if len(prompt) > 70:
prompt = '%s [%s]' % (originalPrompt, ' / '.join(possibilities)) prompt = '%s [%s]' % (originalPrompt, '/ '.join(possibilities))
indent = ' ' * (len(originalPrompt) + 3) indent = ' ' * (len(originalPrompt) + 2)
prompt = textwrap.fill(prompt, subsequent_indent=indent) prompt = textwrap.fill(prompt, subsequent_indent=indent)
prompt = prompt.replace('/ ', '/')
prompt = prompt.strip() + ' ' prompt = prompt.strip() + ' '
s = raw_input(prompt) s = raw_input(prompt)
s = s.strip() s = s.strip()
@ -53,7 +54,7 @@ def expect(prompt, possibilities, recursed=False):
return s.strip() return s.strip()
def expectWithDefault(prompt, possibilities, default): def expectWithDefault(prompt, possibilities, default):
indent = ' ' * (len(prompt) + 3) indent = ' ' * (len(prompt) + 2)
prompt = '%s [%s] (default: %s) ' % \ prompt = '%s [%s] (default: %s) ' % \
(prompt.strip(), '/'.join(possibilities), default) (prompt.strip(), '/'.join(possibilities), default)
if len(prompt) > 70: if len(prompt) > 70: