From 5ec5b997ca79947fac3b24bbcfd197a20f8281da Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Fri, 1 Aug 2003 23:48:02 +0000 Subject: [PATCH] Made safeArgument handle colors correctly. --- src/ircutils.py | 2 +- test/test_ircutils.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ircutils.py b/src/ircutils.py index 4309d6432..3adaf1c35 100644 --- a/src/ircutils.py +++ b/src/ircutils.py @@ -241,7 +241,7 @@ def isValidArgument(s): """Returns if s is strictly a valid argument for an IRC message.""" return '\r' not in s and '\n' not in s and '\x00' not in s -notFunky = string.ascii[32:]+'\x02' +notFunky = string.ascii[32:]+'\x02'+'\x03' def safeArgument(s): """If s is unsafe for IRC, returns a safe version.""" if isValidArgument(s) and s.translate(string.ascii, notFunky) == '': diff --git a/test/test_ircutils.py b/test/test_ircutils.py index c70f96a65..cb57a537f 100644 --- a/test/test_ircutils.py +++ b/test/test_ircutils.py @@ -95,8 +95,10 @@ class FunctionsTestCase(unittest.TestCase): def testSafeArgument(self): s = 'I have been running for 9 seconds' bolds = ircutils.bold(s) + colors = ircutils.mircColor(s, 'pink', 'orange') self.assertEqual(s, ircutils.safeArgument(s)) self.assertEqual(bolds, ircutils.safeArgument(bolds)) + self.assertEqual(colors, ircutils.safeArgument(colors)) def testIsIP(self): self.failIf(ircutils.isIP('a.b.c'))