String: fix it up to work with the previously committed enhancement f…

…or subprocess timeout.

Conflicts:

	plugins/String/plugin.py

plugins/String/plugin.py

@@ -146,10 +146,14 @@ def re(self, irc, msg, args, ff, text):
             s = _('You probably don\'t want to match the empty string.')
             irc.error(s)
         else:
-            irc.reply(f(text))
-    re = wrap(re, [('checkCapability', 'trusted'),
-                   first('regexpMatcher', 'regexpReplacer'),
-                   'text'])
+            t = self.registryValue('re.timeout')
+            try:
+                v = commands.process(f, text, timeout=t, pn=self.name(), cn='re')
+                irc.reply(v)
+            except commands.ProcessTimeoutError, e:
+                irc.error("ProcessTimeoutError: %s" % (e,))
+    re = thread(wrap(re, [first('regexpMatcher', 'regexpReplacer'),
+                   'text']))
 
     @internationalizeDocstring
     def xor(self, irc, msg, args, password, text):

src/version.py

@@ -1,3 +1,3 @@
 """stick the various versioning attributes in here, so we only have to change
 them once."""
-version = '0.83.4.1+limnoria (2011-08-13T01:53:58+0200)'
+version = '0.83.4.1+limnoria (2011-08-13T01:55:24+0200)'