Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-28 11:30:40 +01:00
Code Issues Projects Releases Wiki Activity

Forgot return after irc.error and added test for non-existent location.

Browse Source
This commit is contained in:
Jeremy Fincher 2003-08-27 22:30:48 +00:00
parent ce67b6ef5a
commit 550f0fb3de
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/Http.py
View File

@ -304,6 +304,7 @@ class Http(callbacks.Privmsg):
fd.close() fd.close()
if 'was not found' in html: if 'was not found' in html:
irc.error(msg, 'No such location could be found.') irc.error(msg, 'No such location could be found.')
return
headData = self._cityregex.search(html) headData = self._cityregex.search(html)
if headData: if headData:
(city, state, country) = headData.groups() (city, state, country) = headData.groups()
@ -324,7 +325,7 @@ class Http(callbacks.Privmsg):
except urllib2.URLError: except urllib2.URLError:
irc.error(msg, 'I couldn\'t open the search page.') irc.error(msg, 'I couldn\'t open the search page.')
except Exception, e: except Exception, e:
debug.recoverableError() debug.recoverableException()
irc.error(msg, debug.exnToString(e)) irc.error(msg, debug.exnToString(e))
_geekquotere = re.compile('<p class="qt">(.*?)</p>') _geekquotere = re.compile('<p class="qt">(.*?)</p>')

2
test/test_Http.py
View File

@ -78,7 +78,7 @@ class HttpTest(PluginTestCase):
self.assertNotError('weather Columbus, OH') self.assertNotError('weather Columbus, OH')
self.assertNotError('weather 43221') self.assertNotError('weather 43221')
self.assertNotRegexp('weather Paris, FR', 'Virginia') self.assertNotRegexp('weather Paris, FR', 'Virginia')
self.assertError('weather alsdkfjasdl, asdlfkjsadlfkj')
# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: