merge
This commit is contained in:
commit
39a50f53f0
|
@ -1,7 +1,7 @@
|
||||||
'''Searches wikipedia and returns first sentence of article
|
'''Searches wikipedia and returns first sentence of article
|
||||||
Scaevolus 2009'''
|
Scaevolus 2009'''
|
||||||
|
|
||||||
import urllib
|
import urllib2
|
||||||
from lxml import etree
|
from lxml import etree
|
||||||
import re
|
import re
|
||||||
|
|
||||||
|
@ -23,8 +23,13 @@ def wiki(inp):
|
||||||
if not inp:
|
if not inp:
|
||||||
return wiki.__doc__
|
return wiki.__doc__
|
||||||
|
|
||||||
q = search_url % (urllib.quote(inp, safe=''))
|
q = search_url % (urllib2.quote(inp, safe=''))
|
||||||
x = etree.parse(q)
|
|
||||||
|
request = urllib2.Request(q)
|
||||||
|
request.add_header('User-Agent', 'Skybot/1.0 http://bitbucket.org/Scaevolus/skybot/')
|
||||||
|
opener = urllib2.build_opener()
|
||||||
|
xml = opener.open(request).read()
|
||||||
|
x = etree.fromstring(xml)
|
||||||
|
|
||||||
ns = '{http://opensearch.org/searchsuggest2}'
|
ns = '{http://opensearch.org/searchsuggest2}'
|
||||||
items = x.findall(ns + 'Section/' + ns + 'Item')
|
items = x.findall(ns + 'Section/' + ns + 'Item')
|
||||||
|
|
Loading…
Reference in New Issue