From b5eac0994a870d065209c07119ebf00b4a3ae8b7 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@users.sourceforge.net>
Date: Wed, 24 Oct 2012 00:26:51 -0400
Subject: [PATCH] Call unqualified process/regexp_wrapper, since commands
 exports them now.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
---
 plugins/Note/plugin.py   | 7 ++++---
 plugins/String/plugin.py | 2 +-
 plugins/Todo/plugin.py   | 8 ++++----
 plugins/__init__.py      | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/plugins/Note/plugin.py b/plugins/Note/plugin.py
index e751b2318..3e8929ea7 100644
--- a/plugins/Note/plugin.py
+++ b/plugins/Note/plugin.py
@@ -35,7 +35,6 @@ import operator
 import supybot.dbi as dbi
 import supybot.log as log
 import supybot.conf as conf
-from supybot import commands
 import supybot.utils as utils
 import supybot.ircdb as ircdb
 from supybot.commands import *
@@ -293,8 +292,10 @@ class Note(callbacks.Plugin):
         own = to
         for (option, arg) in optlist:
             if option == 'regexp':
-                criteria.append(lambda x: commands.regexp_wrapper(x, reobj=arg,
-                        timeout=0.1, plugin_name=self.name(), fcn_name='search'))
+                criteria.append(lambda s:
+                                regexp_wrapper(s, reobj=arg, timeout=0.1,
+                                               plugin_name=self.name(),
+                                               fcn_name='search'))
             elif option == 'sent':
                 own = frm
         if glob:
diff --git a/plugins/String/plugin.py b/plugins/String/plugin.py
index ea734d9e7..46f77a643 100644
--- a/plugins/String/plugin.py
+++ b/plugins/String/plugin.py
@@ -143,7 +143,7 @@ class String(callbacks.Plugin):
         else:
             t = self.registryValue('re.timeout')
             try:
-                v = commands.process(f, text, timeout=t, pn=self.name(), cn='re')
+                v = process(f, text, timeout=t, pn=self.name(), cn='re')
                 irc.reply(v)
             except commands.ProcessTimeoutError, e:
                 irc.error("ProcessTimeoutError: %s" % (e,))
diff --git a/plugins/Todo/plugin.py b/plugins/Todo/plugin.py
index b0038a7d6..03bc9ee9a 100644
--- a/plugins/Todo/plugin.py
+++ b/plugins/Todo/plugin.py
@@ -35,7 +35,6 @@ import operator
 
 import supybot.dbi as dbi
 import supybot.conf as conf
-from supybot import commands
 import supybot.ircdb as ircdb
 import supybot.utils as utils
 from supybot.commands import *
@@ -229,9 +228,10 @@ class Todo(callbacks.Plugin):
         criteria = []
         for (option, arg) in optlist:
             if option == 'regexp':
-                criteria.append(lambda x: commands.regexp_wrapper(x, reobj=arg,
-                        timeout=0.1, plugin_name=self.name(), fcn_name='search'))
-                criteria.append(arg.search)
+                criteria.append(lambda s:
+                                regexp_wrapper(s, reobj=arg, timeout=0.1,
+                                               plugin_name=self.name(),
+                                               fcn_name='search'))
         for glob in globs:
             glob = utils.python.glob2re(glob)
             criteria.append(re.compile(glob).search)
diff --git a/plugins/__init__.py b/plugins/__init__.py
index 3ec8ce00b..008acda48 100644
--- a/plugins/__init__.py
+++ b/plugins/__init__.py
@@ -419,7 +419,7 @@ class ChannelIdDatabasePlugin(callbacks.Plugin):
             if opt == 'by':
                 predicates.append(lambda r, arg=arg: r.by == arg.id)
             elif opt == 'regexp':
-                predicates.append(lambda x: regexp_wrapper(x.text, reobj=arg,
+                predicates.append(lambda r: regexp_wrapper(r.text, reobj=arg,
                         timeout=0.1, plugin_name=self.name(), fcn_name='search'))
         if glob:
             def globP(r, glob=glob.lower()):