Merge pull request #2066 from HamiltonFintech/master

mymemory_translated: fix python 3 support
This commit is contained in:
Adam Tauber 2020-07-13 01:11:53 +02:00 committed by GitHub
commit 6e37255e59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 10 deletions

View File

@ -9,23 +9,19 @@
@parse url, title, content @parse url, title, content
""" """
import re import re
from sys import version_info
from searx.utils import is_valid_lang from searx.utils import is_valid_lang
if version_info[0] == 3:
unicode = str
categories = ['general'] categories = ['general']
url = u'http://api.mymemory.translated.net/get?q={query}&langpair={from_lang}|{to_lang}{key}' url = u'https://api.mymemory.translated.net/get?q={query}&langpair={from_lang}|{to_lang}{key}'
web_url = u'http://mymemory.translated.net/en/{from_lang}/{to_lang}/{query}' web_url = u'https://mymemory.translated.net/en/{from_lang}/{to_lang}/{query}'
weight = 100 weight = 100
parser_re = re.compile(u'.*?([a-z]+)-([a-z]+) (.{2,})$', re.I) parser_re = re.compile(b'.*?([a-z]+)-([a-z]+) (.{2,})$', re.I)
api_key = '' api_key = ''
def request(query, params): def request(query, params):
m = parser_re.match(unicode(query, 'utf8')) m = parser_re.match(query)
if not m: if not m:
return params return params
@ -43,9 +39,9 @@ def request(query, params):
key_form = '' key_form = ''
params['url'] = url.format(from_lang=from_lang[1], params['url'] = url.format(from_lang=from_lang[1],
to_lang=to_lang[1], to_lang=to_lang[1],
query=query, query=query.decode('utf-8'),
key=key_form) key=key_form)
params['query'] = query params['query'] = query.decode('utf-8')
params['from_lang'] = from_lang params['from_lang'] = from_lang
params['to_lang'] = to_lang params['to_lang'] = to_lang