diff --git a/plugins/Web/plugin.py b/plugins/Web/plugin.py index c85af765b..0f9714a1f 100644 --- a/plugins/Web/plugin.py +++ b/plugins/Web/plugin.py @@ -208,30 +208,6 @@ class Web(callbacks.PluginRegexp): 'within the first %S.'), size)) title = wrap(title, [getopts({'no-filter': ''}), 'httpUrl']) - _netcraftre = re.compile(r'td align="left">\s+]+>(.*?) - - Returns Netcraft.com's determination of what operating system and - webserver is running on the host given. - """ - url = 'http://uptime.netcraft.com/up/graph/?host=' + hostname - html = utils.web.getUrl(url) \ - .decode('utf8') - m = self._netcraftre.search(html) - if m: - html = m.group(1) - s = utils.web.htmlToText(html, tagReplace='').strip() - s = s.rstrip('-').strip() - irc.reply(s) # Snip off "the site" - elif 'We could not get any results' in html: - irc.reply(_('No results found for %s.') % hostname) - else: - irc.error(_('The format of page the was odd.')) - netcraft = wrap(netcraft, ['text']) - @internationalizeDocstring def urlquote(self, irc, msg, args, text): """ diff --git a/plugins/Web/test.py b/plugins/Web/test.py index 617f0613c..7a51832d8 100644 --- a/plugins/Web/test.py +++ b/plugins/Web/test.py @@ -71,9 +71,6 @@ class WebTestCase(ChannelPluginTestCase): self.assertNotError( 'title http://www.youtube.com/watch?v=x4BtiqPN4u8') - def testNetcraft(self): - self.assertNotError('netcraft slashdot.org') - def testTitleSnarfer(self): try: conf.supybot.plugins.Web.titleSnarfer.setValue(True)