Used textwrap to make things prettier.

This commit is contained in:
Jeremy Fincher 2003-08-28 22:55:22 +00:00
parent 63eb848946
commit 3c8a7c2387

View File

@ -29,12 +29,18 @@
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
### ###
import textwrap
def expect(prompt, possibilities, recursed=False): def expect(prompt, possibilities, recursed=False):
originalPrompt = prompt originalPrompt = prompt
if recursed: if recursed:
print 'Sorry, that response was not an option.' print 'Sorry, that response was not an option.'
if possibilities: if possibilities:
prompt = '%s [%s]' % (prompt, '/'.join(possibilities)) prompt = '%s [%s]' % (originalPrompt, '/'.join(possibilities))
if len(prompt) > 70:
prompt = '%s [%s]' % (originalPrompt, ' / '.join(possibilities))
indent = ' ' * (len(originalPrompt) + 3)
prompt = textwrap.fill(prompt, subsequent_indent=indent)
prompt = prompt.strip() + ' ' prompt = prompt.strip() + ' '
s = raw_input(prompt) s = raw_input(prompt)
s = s.strip() s = s.strip()
@ -47,9 +53,13 @@ def expect(prompt, possibilities, recursed=False):
return s.strip() return s.strip()
def expectWithDefault(prompt, possibilities, default): def expectWithDefault(prompt, possibilities, default):
prompt = prompt.strip() + ' ' indent = ' ' * (len(prompt) + 3)
prompt = '%s [%s] (default: %s) ' % \ prompt = '%s [%s] (default: %s) ' % \
(prompt.strip(), '/'.join(possibilities), default) (prompt.strip(), '/'.join(possibilities), default)
if len(prompt) > 70:
prompt = '%s [%s] (default: %s) ' % \
(prompt.strip(), ' / '.join(possibilities), default)
prompt = textwrap.fill(prompt, subsequent_indent=indent)
s = raw_input(prompt) s = raw_input(prompt)
s = s.strip() s = s.strip()
if s in possibilities: if s in possibilities: