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

use global GrumbleError for web exceptions

Browse Source
This commit is contained in:
mutantmonkey
2012-06-01 22:17:09 -07:00
parent 28cde318a8
commit 9add0985ec
16 changed files with 85 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/rule34.py
View File

@@ -6,6 +6,7 @@ author: mutantmonkey <mutantmonkey@mutantmonkey.in>
from urllib.parse import quote as urlquote
from urllib.error import HTTPError
from tools import GrumbleError
import web
import lxml.html
@@ -20,8 +21,7 @@ def rule34(phenny, input):
try:
req = web.get("http://rule34.xxx/index.php?page=post&s=list&tags={0}".format(urlquote(q)))
except (HTTPError, IOError):
phenny.say("THE INTERNET IS FUCKING BROKEN. Please try again later.")
return
raise GrumbleError("THE INTERNET IS FUCKING BROKEN. Please try again later.")
doc = lxml.html.fromstring(req)
doc.make_links_absolute('http://rule34.xxx/')
@@ -33,8 +33,7 @@ def rule34(phenny, input):
try:
link = thumbs[0].find('a').attrib['href']
except AttributeError:
phenny.say("THE INTERNET IS FUCKING BROKEN. Please try again later.")
return
raise GrumbleError("THE INTERNET IS FUCKING BROKEN. Please try again later.")
response = '!!NSFW!! -> {0} <- !!NSFW!!'.format(link)
phenny.reply(response)