remove oblique and make .wa local

modules/calc.py

@@ -15,30 +15,31 @@ r_result = re.compile(r'(?i)<A NAME=results>(.*?)</A>')
 r_tag = re.compile(r'<\S+.*?>')
 
 subs = [
-    (' in ', ' -> '), 
-    (' over ', ' / '), 
-    ('£', 'GBP '), 
-    ('€', 'EUR '), 
-    ('\$', 'USD '), 
-    (r'\bKB\b', 'kilobytes'), 
-    (r'\bMB\b', 'megabytes'), 
-    (r'\bGB\b', 'kilobytes'), 
-    ('kbps', '(kilobits / second)'), 
+    (' in ', ' -> '),
+    (' over ', ' / '),
+    ('£', 'GBP '),
+    ('€', 'EUR '),
+    ('\$', 'USD '),
+    (r'\bKB\b', 'kilobytes'),
+    (r'\bMB\b', 'megabytes'),
+    (r'\bGB\b', 'kilobytes'),
+    ('kbps', '(kilobits / second)'),
     ('mbps', '(megabits / second)')
 ]
 
-def c(phenny, input): 
+
+def c(phenny, input):
     """Google calculator."""
     if not input.group(2):
         return phenny.reply("Nothing to calculate.")
     q = input.group(2)
-    q = q.replace('\xcf\x95', 'phi') # utf-8 U+03D5
-    q = q.replace('\xcf\x80', 'pi') # utf-8 U+03C0
+    q = q.replace('\xcf\x95', 'phi')  # utf-8 U+03D5
+    q = q.replace('\xcf\x80', 'pi')  # utf-8 U+03C0
     uri = 'http://www.google.com/ig/calculator?q='
     bytes = web.get(uri + web.quote(q))
     parts = bytes.split('",')
     answer = [p for p in parts if p.startswith('rhs: "')][0][6:]
-    if answer: 
+    if answer:
         #answer = ''.join(chr(ord(c)) for c in answer)
         #answer = answer.decode('utf-8')
         answer = answer.replace('\\x26#215;', '*')
@@ -48,26 +49,31 @@ def c(phenny, input):
         answer = answer.replace('</sup>', ')')
         answer = web.decode(answer)
         phenny.say(answer)
-    else: phenny.reply('Sorry, no result.')
+    else:
+        phenny.reply('Sorry, no result.')
 c.commands = ['c']
 c.example = '.c 5 + 3'
 
-def wa(phenny, input): 
+
+def wa(phenny, input):
     if not input.group(2):
         return phenny.reply("No search term.")
     query = input.group(2)
-    uri = 'http://tumbolia.appspot.com/wa/'
 
-    answer = web.get(uri + web.quote(query.replace('+', '%2B')))
-    try:
-        answer = answer.split(';')[1]
-    except IndexError:
-        answer = ""
+    re_output = re.compile(r'{"stringified": "(.*?)",')
 
-    if answer: 
-        phenny.say(answer)
-    else: phenny.reply('Sorry, no result.')
+    uri = 'http://www.wolframalpha.com/input/?i={}'
+    out = web.get(uri.format(web.quote(query)))
+    answers = re_output.findall(out)
+    if len(answers) <= 0:
+        phenny.reply("Sorry, no result.")
+        return
+
+    answer = answers[1]
+    answer = answer.replace('\\n', ', ')
+    phenny.say(answer)
 wa.commands = ['wa']
 
-if __name__ == '__main__': 
+
+if __name__ == '__main__':
     print(__doc__.strip())