Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-10-03 01:48:52 +02:00
Code Issues Projects Releases Wiki Activity

Fixed our code that caused a bug in textwrap.py.

Browse Source
This commit is contained in:
Jeremy Fincher 2003-08-30 02:52:35 +00:00
parent e623d2e4b6
commit f3b2ea905d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/questions.py
View File

@ -33,13 +33,13 @@ import textwrap
def expect(prompt, possibilities, recursed=False): def expect(prompt, possibilities, recursed=False):
originalPrompt = prompt originalPrompt = prompt
indent = ' ' * ((len(originalPrompt)%70) + 2)
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]' % (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) + 2)
prompt = textwrap.fill(prompt, subsequent_indent=indent) prompt = textwrap.fill(prompt, subsequent_indent=indent)
prompt = prompt.replace('/ ', '/') prompt = prompt.replace('/ ', '/')
prompt = prompt.strip() + ' ' prompt = prompt.strip() + ' '
@ -54,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) + 2) indent = ' ' * ((len(prompt)%70) + 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: