Merge lp:~stefanor/ibid/google-scrapers-888132 into lp:ibid

[Stefano Rivera]

Update gcalc scraping

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'ibid/plugins/google.py'
--- ibid/plugins/google.py	2011-02-16 08:01:51 +0000
+++ ibid/plugins/google.py	2011-11-09 16:06:28 +0000
@@ -108,7 +108,7 @@
     def calc(self, event, expression):
         tree = self._google_scrape_search(expression)
 
-        nodes = [node for node in tree.findall('.//h2/b')]
+        nodes = [node for node in tree.findall('.//h2') if node.get('class') == 'r']
         if len(nodes) == 1:
             # ElementTree doesn't support inline tags:
             # May return ASCII unless an encoding is specified.
@@ -121,6 +121,7 @@
             node = re.sub(r'(\d)\s+(\d)', lambda x: x.group(1) + x.group(2),
                           node)
             node = decode_htmlentities(node)
+            node = re.sub(r'\s+', ' ', node)
             event.addresponse(node)
         else:
             event.addresponse(