ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed SimpleJSON dependency

Browse source
This commit is contained in:
lukeroge 2011-11-21 21:41:53 +13:00
parent d45043b9cf
commit 7dfb881e42
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/shorten.py
View file

@ -1,11 +1,11 @@
# # Lukeroge # # Lukeroge
from util import hook from util import hook, http
try: try:
from re import match from re import match
from urllib2 import urlopen, Request, HTTPError from urllib2 import urlopen, Request, HTTPError
from urllib import urlencode from urllib import urlencode
from simplejson import loads
except ImportError, e: except ImportError, e:
raise Exception('Required module missing: %s' % e.args[0]) raise Exception('Required module missing: %s' % e.args[0])
@ -14,12 +14,12 @@ def tiny(url, user, apikey):
params = urlencode({'longUrl': url, 'login': user, 'apiKey': apikey, 'format': 'json'}) params = urlencode({'longUrl': url, 'login': user, 'apiKey': apikey, 'format': 'json'})
req = Request("http://api.bit.ly/v3/shorten?%s" % params) req = Request("http://api.bit.ly/v3/shorten?%s" % params)
response = urlopen(req) response = urlopen(req)
j = loads(response.read()) j = http.get_json(response.read())
if j['status_code'] == 200: if j['status_code'] == 200:
return j['data']['url'] return j['data']['url']
raise Exception('%s'%j['status_txt']) raise Exception('%s'%j['status_txt'])
except HTTPError, e: except HTTPError, e:
raise('HTTP error%s'%e.read()) return "Invalid URL!"
@hook.command @hook.command
def shorten(inp, bot = None): def shorten(inp, bot = None):