Moved some commands from Utilities to Format.

plugins/Format.py

@@ -38,6 +38,8 @@ __author__ = ''
 
 import plugins
 
+import string
+
 import conf
 import utils
 import ircutils
@@ -108,6 +110,56 @@ class Format(callbacks.Privmsg):
                 return
         irc.reply(ircutils.mircColor(text, fg=fg, bg=bg))
 
+    def join(self, irc, msg, args):
+        """<separator> <string 1> [<string> ...]
+
+        Joins all the arguments together with <separator>.
+        """
+        sep = args.pop(0)
+        irc.reply(sep.join(args))
+
+    def translate(self, irc, msg, args):
+        """<chars to translate> <chars to replace those with> <text>
+
+        Replaces <chars to translate> with <chars to replace those with> in
+        <text>.  The first and second arguments must necessarily be the same
+        length.
+        """
+        (bad, good, text) = privmsgs.getArgs(args, required=3)
+        irc.reply(text.translate(string.maketrans(bad, good)))
+
+    def upper(self, irc, msg, args):
+        """<text>
+
+        Returns <text> uppercased.
+        """
+        irc.reply(privmsgs.getArgs(args).upper())
+
+    def lower(self, irc, msg, args):
+        """<text>
+
+        Returns <text> lowercased.
+        """
+        irc.reply(privmsgs.getArgs(args).lower())
+
+    def repr(self, irc, msg, args):
+        """<text>
+
+        Returns the text surrounded by double quotes.
+        """
+        text = privmsgs.getArgs(args)
+        irc.reply(utils.dqrepr(text))
+
+    def concat(self, irc, msg, args):
+        """<string 1> <string 2>
+
+        Concatenates two strings.  Do keep in mind that this is *not* the same
+        thing as strjoin "", since if <string 2> contains spaces, they won't be
+        removed by strconcat.
+        """
+        (first, second) = privmsgs.getArgs(args, required=2)
+        irc.reply(first+second)
+
     def format(self, irc, msg, args):
         """<format string> [<arg> ...]
 

plugins/Utilities.py

@@ -87,38 +87,6 @@ class Utilities(callbacks.Privmsg):
         else:
             raise callbacks.Error
 
-    def strjoin(self, irc, msg, args):
-        """<separator> <string 1> [<string> ...]
-
-        Joins all the arguments together with <separator>.
-        """
-        sep = args.pop(0)
-        irc.reply(sep.join(args))
-
-    def strtranslate(self, irc, msg, args):
-        """<chars to translate> <chars to replace those with> <text>
-
-        Replaces <chars to translate> with <chars to replace those with> in
-        <text>.  The first and second arguments must necessarily be the same
-        length.
-        """
-        (bad, good, text) = privmsgs.getArgs(args, required=3)
-        irc.reply(text.translate(string.maketrans(bad, good)))
-
-    def strupper(self, irc, msg, args):
-        """<text>
-
-        Returns <text> uppercased.
-        """
-        irc.reply(privmsgs.getArgs(args).upper())
-
-    def strlower(self, irc, msg, args):
-        """<text>
-
-        Returns <text> lowercased.
-        """
-        irc.reply(privmsgs.getArgs(args).lower())
-
     def strlen(self, irc, msg, args):
         """<text>
 
@@ -130,24 +98,6 @@ class Utilities(callbacks.Privmsg):
         total += len(args)-1 # spaces between the arguments.
         irc.reply(str(total))
 
-    def repr(self, irc, msg, args):
-        """<text>
-
-        Returns the text surrounded by double quotes.
-        """
-        text = privmsgs.getArgs(args)
-        irc.reply(utils.dqrepr(text))
-
-    def strconcat(self, irc, msg, args):
-        """<string 1> <string 2>
-
-        Concatenates two strings.  Do keep in mind that this is *not* the same
-        thing as strjoin "", since if <string 2> contains spaces, they won't be
-        removed by strconcat.
-        """
-        (first, second) = privmsgs.getArgs(args, required=2)
-        irc.reply(first+second)
-
     def echo(self, irc, msg, args):
         """takes any number of arguments
 

test/test_Format.py

@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+
+###
+# Copyright (c) 2002, Jeremiah Fincher
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright notice,
+#     this list of conditions, and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions, and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#   * Neither the name of the author of this software nor the name of
+#     contributors to this software may be used to endorse or promote products
+#     derived from this software without specific prior written consent.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+###
+
+from testsupport import *
+
+class UtilitiesTestCase(PluginTestCase):
+    plugins = ('Format',)
+    def testBold(self):
+        self.assertResponse('bold foobar', '\x02foobar\x02')
+
+    def testUnderline(self):
+        self.assertResponse('underline foobar', '\x1ffoobar\x1f')
+
+    def testReverse(self):
+        self.assertResponse('reverse foobar', '\x16foobar\x16')
+
+
+    def testFormat(self):
+        self.assertResponse('format %s foo', 'foo')
+        self.assertResponse('format %s%s foo bar', 'foobar')
+        self.assertResponse('format "%sbaz%s" "foo bar" 1', 'foo barbaz1')
+        self.assertError('format %s foo bar')
+        self.assertError('format %s%s foo')
+        
+    def testJoin(self):
+        self.assertResponse('join + foo bar baz', 'foo+bar+baz')
+
+    def testTranslate(self):
+        self.assertResponse('translate 123 456 1234567890', '4564567890')
+
+    def testUpper(self):
+        self.assertResponse('upper foo', 'FOO')
+        self.assertResponse('upper FOO', 'FOO')
+
+    def testLower(self):
+        self.assertResponse('lower foo', 'foo')
+        self.assertResponse('lower FOO', 'foo')
+
+    def testRepr(self):
+        self.assertResponse('repr foo bar baz', '"foo bar baz"')
+
+    def testConcat(self):
+        self.assertResponse('concat foo bar baz', 'foobar baz')
+
+# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:

test/test_Utilities.py

@@ -44,30 +44,10 @@ class UtilitiesTestCase(PluginTestCase):
     def testLast(self):
         self.assertResponse('utilities last foo bar baz', 'baz')
 
-    def testStrjoin(self):
-        self.assertResponse('strjoin + foo bar baz', 'foo+bar+baz')
-
-    def testStrtranslate(self):
-        self.assertResponse('strtranslate 123 456 1234567890', '4564567890')
-
-    def testStrupper(self):
-        self.assertResponse('strupper foo', 'FOO')
-        self.assertResponse('strupper FOO', 'FOO')
-
-    def testStrlower(self):
-        self.assertResponse('strlower foo', 'foo')
-        self.assertResponse('strlower FOO', 'foo')
-
     def testStrlen(self):
         self.assertResponse('strlen %s' % ('s'*10), '10')
         self.assertResponse('strlen a b', '3')
 
-    def testRepr(self):
-        self.assertResponse('repr foo bar baz', '"foo bar baz"')
-
-    def testStrconcat(self):
-        self.assertResponse('strconcat foo bar baz', 'foobar baz')
-
     def testEcho(self):
         self.assertHelp('echo')
         self.assertResponse('echo foo', 'foo')