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

fix wiktionary no results error handling

master
mutantmonkey 2012-06-07 18:17:55 -07:00
parent 931b53a974
commit cf53da9d6e
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/test/test_wiktionary.py
View File

@ -20,6 +20,12 @@ class TestWiktionary(unittest.TestCase):
assert len(w[0]) > 0 assert len(w[0]) > 0
assert len(w[1]) > 0 assert len(w[1]) > 0
def test_wiktionary_none(self):
w = wiktionary.wiktionary('Hell!')
assert len(w[0]) == 0
assert len(w[1]) == 0
def test_w(self): def test_w(self):
input = Mock(group=lambda x: 'test') input = Mock(group=lambda x: 'test')
wiktionary.w(self.phenny, input) wiktionary.w(self.phenny, input)
@ -27,3 +33,11 @@ class TestWiktionary(unittest.TestCase):
out = self.phenny.say.call_args[0][0] out = self.phenny.say.call_args[0][0]
m = re.match('^test — noun: .*$', out, flags=re.UNICODE) m = re.match('^test — noun: .*$', out, flags=re.UNICODE)
self.assertTrue(m) self.assertTrue(m)
def test_w_none(self):
word = 'Hell!'
input = Mock(group=lambda x: word)
wiktionary.w(self.phenny, input)
self.phenny.say.assert_called_once_with(
"Couldn't get any definitions for {0}.".format(word))

4
modules/wiktionary.py
View File

@ -38,7 +38,11 @@ def wiktionary(word):
pages = json.loads(bytes) pages = json.loads(bytes)
pages = pages['query']['pages'] pages = pages['query']['pages']
pg = next(iter(pages)) pg = next(iter(pages))
try:
result = pages[pg]['revisions'][0]['*'] result = pages[pg]['revisions'][0]['*']
except KeyError:
return '', ''
mode = None mode = None
etymology = None etymology = None