From 67870237fd26ed6f2c478eb248cc005e46d747b2 Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Sat, 22 Mar 2003 09:07:14 +0000
Subject: [PATCH] Removed cfactive, since, well, CoderForums isn't active.

---
 plugins/Http.py | 34 ++++++----------------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/plugins/Http.py b/plugins/Http.py
index 5791af31d..081ec05c0 100644
--- a/plugins/Http.py
+++ b/plugins/Http.py
@@ -50,11 +50,11 @@ class FreshmeatException(Exception):
 
 class Http(callbacks.Privmsg):
     threaded = True
-    _fmProject = re.compile('<projectname_full>(.*?)</projectname_full>')
-    _fmVersion = re.compile('<latest_version>(.*?)</latest_version>')
-    _fmVitality = re.compile('<vitality_percent>(.*?)</vitality_percent>')
-    _fmPopularity =re.compile('<popularity_percent>(.*?)</popularity_percent>')
-    _fmLastUpdated = re.compile('<date_updated>(.*?)</date_updated>')
+    _fmProject = re.compile('<projectname_full>([^<]+)</projectname_full>')
+    _fmVersion = re.compile('<latest_version>([^<]+)</latest_version>')
+    _fmVitality = re.compile('<vitality_percent>([^<]+)</vitality_percent>')
+    _fmPopular=re.compile('<popularity_percent>([^<]+)</popularity_percent>')
+    _fmLastUpdated = re.compile('<date_updated>([^<]+)</date_updated>')
     def freshmeat(self, irc, msg, args):
         "<project name>"
         project = privmsgs.getArgs(args)
@@ -68,7 +68,7 @@ class Http(callbacks.Privmsg):
             project = self._fmProject.search(text).group(1)
             version = self._fmVersion.search(text).group(1)
             vitality = self._fmVitality.search(text).group(1)
-            popularity = self._fmPopularity.search(text).group(1)
+            popularity = self._fmPopular.search(text).group(1)
             lastupdated = self._fmLastUpdated.search(text).group(1)
             irc.reply(msg,
               '%s, last updated %s, with a vitality percent of %s '\
@@ -80,28 +80,6 @@ class Http(callbacks.Privmsg):
             debug.recoverableException()
             irc.reply(msg, debug.exnToString(e))
 
-    _htmlTag = re.compile('<.*?>')
-    _htmlEntity = re.compile('&.*?;')
-    _html = re.compile('<.*?>|&.*?;')
-    def cfactive(self, irc, msg, args):
-        "takes no arguments."
-        try:
-            fd = urllib2.urlopen('http://www.coderforums.net/')
-        except Exception, e:
-            irc.error(msg, debug.exnToString(e))
-        text = fd.read()
-        fd.close()
-        text = self._htmlTag.sub('', text)
-        lines = text.splitlines()
-        sent = False
-        for i in range(len(lines) - 1):
-            if lines[i].strip().startswith('Most'):
-                sent = True
-                irc.reply(msg, lines[i+1].strip())
-                break
-        if not sent:
-            irc.reply(msg, 'The format of the page seems odd.')
-
     def stockquote(self, irc, msg, args):
         "<company symbol>"
         symbol = privmsgs.getArgs(args)