ShrinkUrl: Use tinyurl's api-create page to avoid screen-scraping.

Set snarfThrottle to 0 while testing since we know there's nothing other than
the test input that could be causing us to snarf.  Fixes some intermittent
test failures due to fast snarf responses.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>

plugins/ShrinkUrl/plugin.py

@@ -166,18 +166,15 @@ def ln(self, irc, msg, args, url):
             irc.error(str(e))
     ln = thread(wrap(ln, ['url']))
 
-    _tinyRe = re.compile(r'<blockquote><b>(http://tinyurl\.com/\w+)</b>')
     def _getTinyUrl(self, url):
         try:
             return self.db.get('tiny', url)
         except KeyError:
-            s = utils.web.getUrl('http://tinyurl.com/create.php?url=' + url)
-            m = self._tinyRe.search(s)
-            if m is None:
-                raise ShrinkError, 'Could not parse the TinyURL.com results.'
-            tinyurl = m.group(1)
-            self.db.set('tiny', url, tinyurl)
-            return tinyurl
+            text = utils.web.getUrl('http://tinyurl.com/api-create.php?url=' + url)
+            if text.startswith('Error'):
+                raise ShrinkError, text[5:]
+            self.db.set('tiny', url, text)
+            return text
 
     def tiny(self, irc, msg, args, url):
         """<url>

plugins/ShrinkUrl/test.py

@@ -32,7 +32,7 @@
 
 class ShrinkUrlTestCase(ChannelPluginTestCase):
     plugins = ('ShrinkUrl',)
-    config = {'supybot.snarfThrottle': .5}
+    config = {'supybot.snarfThrottle': 0}
 
     sfUrl ='http://sourceforge.net/tracker/?func=add&group_id=58965&atid=48947'
     udUrl = 'http://www.urbandictionary.com/define.php?' \