@@ -9,23 +9,19 @@
99 @parse url, title, content
1010"""
1111import re
12−from sys import version_info
1312from searx.utils import is_valid_lang
1413
15−if version_info[0] == 3:
16− unicode = str
17−
1814categories = ['general']
19−url = u'http://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}'
15+url = u'https://api.mymemory.translated.net/get?q={query}&langpair={from_lang}|{to_lang}{key}'
16+web_url = u'https://mymemory.translated.net/en/{from_lang}/{to_lang}/{query}'
2117weight = 100
2218
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)
2420api_key = ''
2521
2622
2723def request(query, params):
28− m = parser_re.match(unicode(query, 'utf8'))
24+ m = parser_re.match(query)
2925 if not m:
3026 return params
3127
@@ -43,9 +39,9 @@ def request(query, params):
4339 key_form = ''
4440 params['url'] = url.format(from_lang=from_lang[1],
4541 to_lang=to_lang[1],
46− query=query,
42+ query=query.decode('utf-8'),
4743 key=key_form)
48− params['query'] = query
44+ params['query'] = query.decode('utf-8')
4945 params['from_lang'] = from_lang
5046 params['to_lang'] = to_lang
5147