From bc59e3ca647971dbe05f96b568f8b5aca1ffa26a Mon Sep 17 00:00:00 2001 From: James Vega Date: Fri, 28 Jan 2005 16:10:53 +0000 Subject: [PATCH] Change the remaining utils.normalizeWhitespace calls to utils.str.normalizeWhitespace. --- scripts/supybot | 6 +++--- src/questions.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/supybot b/scripts/supybot index 7caccecb7..a859467cd 100644 --- a/scripts/supybot +++ b/scripts/supybot @@ -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() diff --git a/src/questions.py b/src/questions.py index ef2014c11..ab73bba4f 100644 --- a/src/questions.py +++ b/src/questions.py @@ -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.')