From f3b2ea905d80d3fdb0fa9b48b58cc2592d9b76af Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Sat, 30 Aug 2003 02:52:35 +0000 Subject: [PATCH] Fixed our code that caused a bug in textwrap.py. --- src/questions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/questions.py b/src/questions.py index 0ea461195..e595d0975 100644 --- a/src/questions.py +++ b/src/questions.py @@ -33,13 +33,13 @@ import textwrap def expect(prompt, possibilities, recursed=False): originalPrompt = prompt + indent = ' ' * ((len(originalPrompt)%70) + 2) if recursed: print 'Sorry, that response was not an option.' if possibilities: prompt = '%s [%s]' % (originalPrompt, '/'.join(possibilities)) if len(prompt) > 70: prompt = '%s [%s]' % (originalPrompt, '/ '.join(possibilities)) - indent = ' ' * (len(originalPrompt) + 2) prompt = textwrap.fill(prompt, subsequent_indent=indent) prompt = prompt.replace('/ ', '/') prompt = prompt.strip() + ' ' @@ -54,7 +54,7 @@ def expect(prompt, possibilities, recursed=False): return s.strip() def expectWithDefault(prompt, possibilities, default): - indent = ' ' * (len(prompt) + 2) + indent = ' ' * ((len(prompt)%70) + 2) prompt = '%s [%s] (default: %s) ' % \ (prompt.strip(), '/'.join(possibilities), default) if len(prompt) > 70: