Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-23 11:12:47 +01:00
Code Issues Projects Releases Wiki Activity

Change the remaining utils.normalizeWhitespace calls to utils.str.normalizeWhitespace.

Browse Source
This commit is contained in:
James Vega 2005-01-28 16:10:53 +00:00
parent 5c72ded4a8
commit bc59e3ca64
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/supybot
View File

@ -179,9 +179,9 @@ if __name__ == '__main__':
if len(args) > 1: if len(args) > 1:
parser.error("""Only one configuration option should be specified.""") parser.error("""Only one configuration option should be specified.""")
elif not args: elif not args:
parser.error(utils.normalizeWhitespace("""It seems you've given me no parser.error(utils.str.normalizeWhitespace("""It seems you've given me
configuration file. If you have a configuration file, be sure to tell no configuration file. If you have a configuration file, be sure to
its filename. If you don't have a configuration file, read tell its filename. If you don't have a configuration file, read
docs/GETTING_STARTED and follow its directions.""")) docs/GETTING_STARTED and follow its directions."""))
else: else:
registryFilename = args.pop() registryFilename = args.pop()

4
src/questions.py
View File

@ -42,7 +42,7 @@ useBold = False
def output(s, unformatted=True, fd=sys.stdout): def output(s, unformatted=True, fd=sys.stdout):
if unformatted: if unformatted:
s = textwrap.fill(utils.normalizeWhitespace(s), width=65) s = textwrap.fill(utils.str.normalizeWhitespace(s), width=65)
print >>fd, s print >>fd, s
print >>fd print >>fd
@ -52,7 +52,7 @@ def expect(prompt, possibilities, recursed=False, default=None,
If possibilities is empty, allow anything. If possibilities is empty, allow anything.
""" """
prompt = utils.normalizeWhitespace(prompt) prompt = utils.str.normalizeWhitespace(prompt)
originalPrompt = prompt originalPrompt = prompt
if recursed: if recursed:
output('Sorry, that response was not an option.') output('Sorry, that response was not an option.')