Google: use google ig api for the calc. no more web scraping. let's hope this stays alive.

Conflicts:

	plugins/Google/plugin.py

plugins/Google/plugin.py

@@ -324,13 +324,9 @@ class Google(callbacks.PluginRegexp):
     def _googleUrl(self, s):
         s = s.replace('+', '%2B')
         s = s.replace(' ', '+')
-        url = r'http://google.com/search?q=' + s
+        url = r'http://www.google.com/ig/calculator?hl=en&q=' + s
         return url
 
-    _calcRe = re.compile(r'<h\d class="?r"?[^>]*>(?:<b>)?(.*?)(?:</b>)?</h\d>', re.I | re.S)
-    _calcSupRe = re.compile(r'<sup>(.*?)</sup>', re.I)
-    _calcFontRe = re.compile(r'<font size=-2>(.*?)</font>')
-    _calcTimesRe = re.compile(r'&(?:times|#215);')
     @internationalizeDocstring
     def calc(self, irc, msg, args, expr):
         """<expression>
@@ -338,17 +334,15 @@ class Google(callbacks.PluginRegexp):
         Uses Google's calculator to calculate the value of <expression>.
         """
         url = self._googleUrl(expr)
-        html = utils.web.getUrl(url)
-        match = self._calcRe.search(html)
-        if match is not None:
-            s = match.group(1)
-            s = self._calcSupRe.sub(r'^(\1)', s)
-            s = self._calcFontRe.sub(r',', s)
-            s = self._calcTimesRe.sub(r'*', s)
-            s = utils.web.htmlToText(s)
-            irc.reply(s)
+        js = utils.web.getUrl(url)
+        # fix bad google json
+        js = js.replace('lhs:','"lhs":').replace('rhs:','"rhs":').replace('error:','"error":').replace('icc:','"icc":')
+        js = simplejson.loads(js)
+
+        if js['error'] == '':
+            irc.reply("%s = %s" % (js['lhs'], js['rhs'],))
         else:
-            irc.reply(_('Google\'s calculator didn\'t come up with anything.'))
+            irc.reply(_('Google says: Error: %s.') % (js['error'],))
     calc = wrap(calc, ['text'])
 
     _phoneRe = re.compile(r'Phonebook.*?<font size=-1>(.*?)<a href')