From 0349f7b3b129c0612ffa8d899a59da552e0be8c4 Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Tue, 21 Oct 2003 05:32:57 +0000
Subject: [PATCH] Converted to use more generic command names.

---
 plugins/News.py   | 14 +++++++-------
 test/test_News.py | 26 +++++++++++++-------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/plugins/News.py b/plugins/News.py
index d2ad5ec0b..70e5104b1 100644
--- a/plugins/News.py
+++ b/plugins/News.py
@@ -98,7 +98,7 @@ class News(plugins.ChannelDBHandler, callbacks.Privmsg):
         db.commit()
         return db
 
-    def addnews(self, irc, msg, args, channel):
+    def add(self, irc, msg, args, channel):
         """[<channel>] <expires> <subject>: <text>
 
         Adds a given news item of <text> to a channel with the given <subject>.
@@ -131,7 +131,7 @@ class News(plugins.ChannelDBHandler, callbacks.Privmsg):
                        subject[:-1], text, added_at, expires, name)
         db.commit()
         irc.reply(msg, conf.replySuccess)
-    addnews = privmsgs.checkChannelCapability(addnews, 'news')
+    add = privmsgs.checkChannelCapability(add, 'news')
 
     def _readnews(self, irc, msg, args):
         """[<channel>] <number>
@@ -190,7 +190,7 @@ class News(plugins.ChannelDBHandler, callbacks.Privmsg):
             s = 'News for %s: %s' % (channel, '; '.join(items))
             irc.reply(msg, s)
 
-    def removenews(self, irc, msg, args, channel):
+    def remove(self, irc, msg, args, channel):
         """[<channel>] <number>
 
         Removes the news item with id <number> from <channel>.  <channel> is
@@ -206,9 +206,9 @@ class News(plugins.ChannelDBHandler, callbacks.Privmsg):
             cursor.execute("""DELETE FROM news WHERE news.id = %s""", id)
             db.commit()
             irc.reply(msg, conf.replySuccess)
-    removenews = privmsgs.checkChannelCapability(removenews, 'news')
+    remove = privmsgs.checkChannelCapability(remove, 'news')
             
-    def changenews(self, irc, msg, args, channel):
+    def change(self, irc, msg, args, channel):
         """[<channel>] <number> <regexp>
 
         Changes the news item with id <number> from <channel> according to the
@@ -235,9 +235,9 @@ class News(plugins.ChannelDBHandler, callbacks.Privmsg):
         cursor.execute("""UPDATE news SET subject=%s, item=%s WHERE id=%s""",
                        newSubject, newItem, id)
         irc.reply(msg, conf.replySuccess)
-    changenews = privmsgs.checkChannelCapability(changenews, 'news')
+    change = privmsgs.checkChannelCapability(change, 'news')
 
-    def oldnews(self, irc, msg, args):
+    def old(self, irc, msg, args):
         """[<channel>] [<number>]
 
         Returns the old news item for <channel> with id <number>.  If no number
diff --git a/test/test_News.py b/test/test_News.py
index df6ead9ac..c20ab1ce5 100644
--- a/test/test_News.py
+++ b/test/test_News.py
@@ -45,11 +45,11 @@ if sqlite is not None:
     class NewsTestCase(ChannelPluginTestCase):
         plugins = ('News',)
         def testAddnews(self):
-            self.assertNotError('addnews 0 subject: foo')
+            self.assertNotError('add 0 subject: foo')
             self.assertRegexp('news', 'subject')
-            self.assertNotError('addnews 0 subject2: foo2')
+            self.assertNotError('add 0 subject2: foo2')
             self.assertRegexp('news', 'subject.*subject2')
-            self.assertNotError('addnews 5 subject3: foo3')
+            self.assertNotError('add 5 subject3: foo3')
             self.assertRegexp('news', 'subject3')
             print
             print 'Sleeping to expire the news item (testAddnews)'
@@ -62,29 +62,29 @@ if sqlite is not None:
             self.assertRegexp('news', 'no news')
             self.assertRegexp('news #channel', 'no news')
             # Now we'll add news and make sure listnews doesn't fail
-            self.assertNotError('addnews #channel 0 subject: foo')
+            self.assertNotError('add #channel 0 subject: foo')
             self.assertNotError('news #channel')
-            self.assertNotError('addnews 0 subject: foo')
+            self.assertNotError('add 0 subject: foo')
             self.assertRegexp('news', '#1')
             self.assertNotError('news 1')
 
         def testChangenews(self):
-            self.assertNotError('addnews 0 Foo: bar')
-            self.assertNotError('changenews 1 s/bar/baz/')
+            self.assertNotError('add 0 Foo: bar')
+            self.assertNotError('change 1 s/bar/baz/')
             self.assertNotRegexp('news 1', 'bar')
             self.assertRegexp('news 1', 'baz')
 
         def testOldnews(self):
-            self.assertError('oldnews')
-            self.assertNotError('addnews 0 a: b')
-            self.assertError('oldnews')
-            self.assertNotError('addnews 5 foo: bar')
-            self.assertError('oldnews')
+            self.assertError('old')
+            self.assertNotError('add 0 a: b')
+            self.assertError('old')
+            self.assertNotError('add 5 foo: bar')
+            self.assertError('old')
             print
             print 'Sleeping to expire the news item (testOldnews)'
             time.sleep(6)
             print 'Done sleeping.'
-            self.assertNotError('oldnews')
+            self.assertNotError('old')
             
 
 # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: