From a63ee1e3044f1a2c4d3a8c0a2d8df359252a369a Mon Sep 17 00:00:00 2001 From: Daniel DiPaolo Date: Thu, 16 Oct 2003 05:39:15 +0000 Subject: [PATCH] * Decided to ditch the "_is_" syntax. I never liked it and implementing it may prove to be difficult here. It may find its way back in, but there's no point in having it in there now when it doesn't work right anyway. --- plugins/MoobotFactoids.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/MoobotFactoids.py b/plugins/MoobotFactoids.py index b8ba7c1b8..45968697b 100644 --- a/plugins/MoobotFactoids.py +++ b/plugins/MoobotFactoids.py @@ -221,14 +221,14 @@ class MoobotFactoids(callbacks.PrivmsgCommandAndRegexp): irc.error(msg, "Spurious type from parseFactoid.") def addFactoid(self, irc, msg, match): - r"^(?!no\s+)(.+)\s+(is|_is_)\s+(?!also)(.+)" + r"^(?!no\s+)(.+)\s+is\s+(?!also)(.+)" # Must be registered! try: id = ircdb.users.getUserId(msg.prefix) except KeyError: irc.error(msg, conf.replyNotRegistered) return - key, _, fact = match.groups() + key, fact = match.groups() cursor = self.db.cursor() # Check and make sure it's not in the DB already cursor.execute("""SELECT * FROM factoids WHERE key = %s""", key) @@ -309,14 +309,14 @@ class MoobotFactoids(callbacks.PrivmsgCommandAndRegexp): irc.reply(msg, conf.replySuccess) def replaceFactoid(self, irc, msg, match): - r"^no,?\s+(.+)\s+(is|_is_)\s+(.+)" + r"^no,?\s+(.+)\s+is\s+(.+)" # Must be registered! try: id = ircdb.users.getUserId(msg.prefix) except KeyError: irc.error(msg, conf.replyNotRegistered) return - key, _, new_fact = match.groups() + key, new_fact = match.groups() cursor = self.db.cursor() # Check and make sure it's in the DB cursor.execute("""SELECT locked_at, fact FROM factoids