[fix] no lambda anymore, cgi.escape

Browse Source
This commit is contained in:
potato 2016-09-06 14:12:46 +02:00
parent 5416f0f248
commit bc806bfab1
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
searx/engines/dictzone.py
View File

@ -1,6 +1,7 @@
import re import re
from urlparse import urljoin from urlparse import urljoin
from lxml import html from lxml import html
from cgi import escape
from searx.engines.xpath import extract_text from searx.engines.xpath import extract_text
from searx.languages import language_codes from searx.languages import language_codes
@ -12,6 +13,19 @@ parser_re = re.compile(u'.*?([a-z]+)-([a-z]+) (.+)', re.I)
results_xpath = './/table[@id="r"]/tr' results_xpath = './/table[@id="r"]/tr'
def is_valid_lang(lang):
is_abbr = (len(lang) == 2)
if is_abbr:
for l in language_codes:
if l[0][:2] == lang.lower():
return (True, l[1].lower())
return False
else:
for l in language_codes:
if l[1].lower() == lang.lower():
return (True, l[1].lower())
return False
def request(query, params): def request(query, params):
m = parser_re.match(unicode(query, 'utf8')) m = parser_re.match(unicode(query, 'utf8'))
if not m: if not m:
@ -19,28 +33,15 @@ def request(query, params):
from_lang, to_lang, query = m.groups() from_lang, to_lang, query = m.groups()
if len(from_lang) == 2: from_lang = is_valid_lang(from_lang)
lan = filter(lambda x: x[0][:2] == from_lang, language_codes) to_lang = is_valid_lang(to_lang)
if lan:
from_lang = lan[0][1].lower() if not from_lang or not to_lang:
else:
return params
elif from_lang.lower() not in [x[1].lower() for x in language_codes]:
return params return params
params['url'] = url.format(from_lang=from_lang[1], to_lang=to_lang[1],query=query)
if len(to_lang) == 2: params['from_lang'] = from_lang[1]
lan = filter(lambda x: x[0][:2] == to_lang, language_codes) params['to_lang'] = to_lang[1]
if lan:
to_lang = lan[0][1].lower()
else:
return params
elif to_lang.lower() not in [x[1].lower() for x in language_codes]:
return params
params['url'] = url.format(from_lang=from_lang, to_lang=to_lang,query=query)
params['from_lang'] = from_lang
params['to_lang'] = to_lang
params['query'] = query params['query'] = query
return params return params
@ -64,8 +65,8 @@ def response(resp):
results.append({ results.append({
'url': urljoin(resp.url, '?%d' % k), 'url': urljoin(resp.url, '?%d' % k),
'title': from_result.text_content(), 'title': escape(from_result.text_content()),
'content': '; '.join(to_results) 'content': escape('; '.join(to_results))
}) })
return results return results