pew
/
phenny
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

calc: fix .c scientific output

master
mutantmonkey 2012-06-05 18:24:43 -07:00
parent c702d7bc59
commit 2dbc8797e5
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/calc.py
View File

@ -41,7 +41,9 @@ def c(phenny, input):
if answer: if answer:
#answer = ''.join(chr(ord(c)) for c in answer) #answer = ''.join(chr(ord(c)) for c in answer)
#answer = answer.decode('utf-8') #answer = answer.decode('utf-8')
answer = answer.replace('\xc2\xa0', ',') answer = answer.replace('\\x26#215;', '*')
answer = answer.replace('\\x3c', '<')
answer = answer.replace('\\x3e', '>')
answer = answer.replace('<sup>', '^(') answer = answer.replace('<sup>', '^(')
answer = answer.replace('</sup>', ')') answer = answer.replace('</sup>', ')')
answer = web.decode(answer) answer = web.decode(answer)

6
modules/test/test_calc.py
View File

@ -18,6 +18,12 @@ class TestCalc(unittest.TestCase):
self.phenny.say.assert_called_once_with('25') self.phenny.say.assert_called_once_with('25')
def test_c_scientific(self):
input = Mock(group=lambda x: '2^64')
c(self.phenny, input)
self.phenny.say.assert_called_once_with('1.84467441 * 10^(19)')
def test_py(self): def test_py(self):
input = Mock(group=lambda x: "'test'*3") input = Mock(group=lambda x: "'test'*3")
py(self.phenny, input) py(self.phenny, input)