Merge lp:~sushkov/ubuntu-bots/irclogin-fixes into lp:~tsimpson/ubuntu-bots/tweak

[Stas Sușcov]

[Stas Sușcov (sushkov)]

Fixed fetching of IRC nicknames. Didn't work cause of layout changes.

Still login won't work cause of FreeNode's IRCd upgraded servers. The new `/whois` reponse is not handled anymore by supybot. Stuff like `msg.tagged('identified')` is not recognized anymore.

[Terence Simpson (tsimpson)]

The HTML scraping is not maintained and will be removed once bug #488394 is fixed

review: Disapprove

Unmerged revisions

155. By Stas Sușcov on 2010-02-19

Now IRC nicknames should work with lp's latest layout

=== modified file 'IRCLogin/lp.py'
--- IRCLogin/lp.py	2009-10-12 18:26:35 +0000
+++ IRCLogin/lp.py	2010-02-19 15:51:15 +0000
@@ -38,26 +38,26 @@
     '''getIRCNick(user, errors) -> list
 Try to get the IRC nick(s) from the LP account "user".
 If errors is True print any errors to stderr, defaults to True
-'''
+''' 
     # Get the HTML data from LP
     try:
         data = urllib2.urlopen('https://launchpad.net/~%s' % user).read()
     except Exception, e:
         if errors: print >> sys.stderr, "Could not get user info (%s)" % e
         return
-    details = '<div class="portletContent portletBody">'
+    details = '<div class="portlet" id="contact-details">'
     # Try and find the "Contact details" section
     sindex = data.find(details)
     if sindex == -1:
         if errors: print >> sys.stderr, "Could not get user info (No data)"
         return
-    eindex = data.find('</div>', sindex) + 6
+    eindex = data.find('<dt>OpenPGP', sindex) + 6
     data = data[sindex:eindex]
     data = [l.strip() for l in data.splitlines() if l.strip()]
     # Look for IRC info
     try:
-        sindex = data.index('<th>IRC:</th>')
-        eindex = data.index('</div>', sindex)
+        sindex = data.index('<dt>IRC:')
+        eindex = data.index('</dl>', sindex)
     except:
         if errors: print >> sys.stderr, "Could not get user info (No IRC nick(s) specified)"
         return
@@ -71,12 +71,12 @@
             break # Try not to loop forever :)
         try:
             # When this fails, it raises an exception
-            s = data.index('<th>IRC:</th>')
-            e = data.index('</tr>') + 1
+            s = data.index('<dd>')
+            e = data.index('</dd>') + 1
             if e <= s:
                 break
             # Limit to freenode nicks
-            if 'freenode' in data[s:e] or 'ubuntu' in data[s:e]:
+            if '<strong>irc.freenode.net</strong>' in data[s:e] or '<strong>irc.ubuntu.com</strong>' in data[s:e]:
                 ircnames.append(data[s:e])
             del data[s:e]
         except: