Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-12-02 08:07:26 +01:00
Code Issues Projects Releases Wiki Activity

Cleanup the use of bolding so user input and default values aren't bolded.

Browse Source
This commit is contained in:
James Vega 2007-10-17 01:47:28 +00:00
parent 88cd051ae0
commit 8c56a60050
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/questions.py
View File

@ -65,15 +65,17 @@ def expect(prompt, possibilities, recursed=False, default=None,
if len(prompt) > 70: if len(prompt) > 70:
prompt = '%s %s' % (originalPrompt, choices % '/ '.join(possibilities)) prompt = '%s %s' % (originalPrompt, choices % '/ '.join(possibilities))
if default is not None: if default is not None:
prompt = '%s (default: %s)' % (prompt, default) if useBold:
prompt = '%s %s(default: %s)' % (prompt, ansi.RESET, default)
else:
prompt = '%s (default: %s)' % (prompt, default)
prompt = textwrap.fill(prompt) prompt = textwrap.fill(prompt)
prompt = prompt.replace('/ ', '/') prompt = prompt.replace('/ ', '/')
prompt = prompt.strip() + ' ' prompt = prompt.strip() + ' '
if useBold: if useBold:
prompt += ansi.RESET
print >>fd, ansi.BOLD, print >>fd, ansi.BOLD,
s = raw_input(prompt) s = raw_input(prompt)
if useBold:
print >>fd, ansi.RESET
s = s.strip() s = s.strip()
print >>fd print >>fd
if possibilities: if possibilities:
@ -125,11 +127,10 @@ def getpass(prompt='Enter password: ', secondPrompt='Re-enter password: '):
prompt += ' ' prompt += ' '
while True: while True:
if useBold: if useBold:
prompt += ansi.RESET
sys.stdout.write(ansi.BOLD) sys.stdout.write(ansi.BOLD)
password = getPass(prompt) password = getPass(prompt)
secondPassword = getPass(secondPrompt) secondPassword = getPass(secondPrompt)
if useBold:
print ansi.RESET
if password != secondPassword: if password != secondPassword:
output('Passwords don\'t match.') output('Passwords don\'t match.')
else: else: