nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Modules: global dusting: call getJSON instead of making raw calls to urllib

Browse source
This commit is contained in:
nemunaire 2014-12-17 07:32:34 +01:00
commit d14fec4cec
14 changed files with 118 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/ycc.py
View file

@ -5,10 +5,10 @@
import re
from urllib.parse import urlparse
from urllib.parse import quote
from urllib.request import urlopen
from hooks import hook
from message import TextMessage
from tools import web
nemubotversion = 3.4
@ -54,11 +54,11 @@ def cmd_ycc(msg):
snd_url = "http://ycc.fr/redirection/create/" + quote(url,
"/:%@&=?")
print_debug(snd_url)
raw = urlopen(snd_url, timeout=10)
page = web.getURLContent(snd_url)
if o.netloc == "":
res.append(gen_response(raw.read().decode(), msg, o.scheme))
res.append(gen_response(page, msg, o.scheme))
else:
res.append(gen_response(raw.read().decode(), msg, o.netloc))
res.append(gen_response(page, msg, o.netloc))
else:
res.append(gen_response(False, msg, url))
return res