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

Merge branch 'master' of https://github.com/sbp/phenny

Browse Source
This commit is contained in:
mutantmonkey
2012-02-08 16:10:37 -05:00
parent f7d3b5f625 436d610ff4
commit ee6ce7ba3e
4 changed files with 100 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/search.py
View File

@@ -20,12 +20,14 @@ class Grab(web.urllib.request.URLopener):
def google_ajax(query):
"""Search using AjaxSearch, and return its JSON."""
if isinstance(query, unicode):
query = query.encode('utf-8')
uri = 'http://ajax.googleapis.com/ajax/services/search/web'
args = '?v=1.0&safe=off&q=' + web.quote(query)
handler = web.urllib.request._urlopener
web.urllib.request._urlopener = Grab()
args = '?v=1.0&safe=off&q=' + web.urllib.quote(query)
handler = web.urllib._urlopener
web.urllib._urlopener = Grab()
bytes = web.get(uri + args)
web.urllib.request._urlopener = handler
web.urllib._urlopener = handler
return web.json(bytes)
def google_search(query):