@@ -9,23 +9,19 @@
9 @parse url, title, content
9 @parse url, title, content
12−from sys import version_info
13from searx.utils import is_valid_lang
12from searx.utils import is_valid_lang
15−if version_info[0] == 3:
18categories = ['general']
14categories = ['general']
19−url = u'http://api.mymemory.translated.net/get?q={query}&langpair={from_lang}|{to_lang}{key}'
15+url = u'https://api.mymemory.translated.net/get?q={query}&langpair={from_lang}|{to_lang}{key}'
20−web_url = u'http://mymemory.translated.net/en/{from_lang}/{to_lang}/{query}'
16+web_url = u'https://mymemory.translated.net/en/{from_lang}/{to_lang}/{query}'
21weight = 100
17weight = 100
23−parser_re = re.compile(u'.*?([a-z]+)-([a-z]+) (.{2,})$', re.I)
19+parser_re = re.compile(b'.*?([a-z]+)-([a-z]+) (.{2,})$', re.I)
24api_key = ''
20api_key = ''
27def request(query, params):
23def request(query, params):
28− m = parser_re.match(unicode(query, 'utf8'))
24+ m = parser_re.match(query)
30 return params
26 return params
@@ -43,9 +39,9 @@ def request(query, params):
43 key_form = ''
39 key_form = ''
44 params['url'] = url.format(from_lang=from_lang[1],
40 params['url'] = url.format(from_lang=from_lang[1],
45 to_lang=to_lang[1],
41 to_lang=to_lang[1],
46− query=query,
42+ query=query.decode('utf-8'),
47 key=key_form)
43 key=key_form)
48− params['query'] = query
44+ params['query'] = query.decode('utf-8')
49 params['from_lang'] = from_lang
45 params['from_lang'] = from_lang
50 params['to_lang'] = to_lang
46 params['to_lang'] = to_lang