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

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

View File

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

View File

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