scrape calc results from google since ddg is broken

modules/calc.py

@@ -10,6 +10,7 @@ http://inamidst.com/phenny/
 
 import re
 import web
+from modules.search import generic_google
 
 subs = [
     ('£', 'GBP '),
@@ -20,30 +21,55 @@ subs = [
     (r'\/', '/'),
 ]
 
+r_google_calc = re.compile(r'calculator-40.gif.*? = (.*?)<')
+r_google_calc_exp = re.compile(r'calculator-40.gif.*? = (.*?)<sup>(.*?)<')
 
 def c(phenny, input):
-    """DuckDuckGo calculator."""
+    """Google calculator."""
     if not input.group(2):
         return phenny.reply("Nothing to calculate.")
     q = input.group(2)
-
+    bytes = generic_google(q)
-    try:
+    m = r_google_calc_exp.search(bytes)
-        r = web.get(
+    if not m:
-            'https://api.duckduckgo.com/?q={}&format=json&no_html=1'
+        m = r_google_calc.search(bytes)
-            '&t=mutantmonkey/phenny'.format(web.quote(q)))
+   
-    except web.HTTPError:
+    if not m:
-        raise GrumbleError("Couldn't parse the result from DuckDuckGo.")
+        num = None
-
+    elif m.lastindex == 1:
-    data = web.json(r)
+        num = web.decode(m.group(1))
-    if data['AnswerType'] == 'calc':
-        answer = data['Answer'].split('=')[-1].strip()
     else:
-        answer = None
+        num = "^".join((web.decode(m.group(1)), web.decode(m.group(2))))
 
-    if answer:
+    if num:
-        phenny.say(answer)
+        phenny.say(num)
     else:
-        phenny.reply('Sorry, no result.')
+        phenny.reply("Sorry, no result.")
+
+
+# def c(phenny, input):
+#     """DuckDuckGo calculator."""
+#     if not input.group(2):
+#         return phenny.reply("Nothing to calculate.")
+#     q = input.group(2)
+#
+#     try:
+#         r = web.get(
+#             'https://api.duckduckgo.com/?q={}&format=json&no_html=1'
+#             '&t=mutantmonkey/phenny'.format(web.quote(q)))
+#     except web.HTTPError:
+#         raise GrumbleError("Couldn't parse the result from DuckDuckGo.")
+#
+#     data = web.json(r)
+#     if data['AnswerType'] == 'calc':
+#         answer = data['Answer'].split('=')[-1].strip()
+#     else:
+#         answer = None
+# 
+#     if answer:
+#         phenny.say(answer)
+#     else:
+#         phenny.reply('Sorry, no result.')
 c.commands = ['c']
 c.example = '.c 5 + 3'
 

modules/test/test_calc.py

@@ -29,7 +29,7 @@ class TestCalc(unittest.TestCase):
         input = Mock(group=lambda x: '2^64')
         c(self.phenny, input)
 
-        self.phenny.say.assert_called_once_with('1.84467440737096 * 10^19')
+        self.phenny.say.assert_called_once_with('1.84467441 × 10^19')
 
     def test_c_none(self):
         input = Mock(group=lambda x: 'aif')