From eb33ae6893ef9d5081b1ddd1119e7047642a40af Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Thu, 17 Dec 2020 09:57:03 +0100 Subject: [fix] Python 3.9: use html.unescape instead of HTMLParser.unescape --- searx/engines/ina.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'searx/engines') diff --git a/searx/engines/ina.py b/searx/engines/ina.py index 52c939498..ce241d409 100644 --- a/searx/engines/ina.py +++ b/searx/engines/ina.py @@ -12,10 +12,10 @@ # @todo embedded (needs some md5 from video page) from json import loads +from html import unescape from urllib.parse import urlencode from lxml import html from dateutil import parser -from html.parser import HTMLParser from searx.utils import extract_text @@ -55,13 +55,12 @@ def response(resp): if "content" not in response: return [] dom = html.fromstring(response["content"]) - p = HTMLParser() # parse results for result in dom.xpath(results_xpath): videoid = result.xpath(url_xpath)[0] url = base_url + videoid - title = p.unescape(extract_text(result.xpath(title_xpath))) + title = unescape(extract_text(result.xpath(title_xpath))) try: thumbnail = extract_text(result.xpath(thumbnail_xpath)[0]) except: -- cgit v1.2.3 From 3f8ebf70b193f4391a01d7412324a10e4faa56a2 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Thu, 17 Dec 2020 09:57:57 +0100 Subject: [fix] pylint: use "raise ... from ..." --- searx/engines/elasticsearch.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'searx/engines') diff --git a/searx/engines/elasticsearch.py b/searx/engines/elasticsearch.py index 081736c1c..0e2d35756 100644 --- a/searx/engines/elasticsearch.py +++ b/searx/engines/elasticsearch.py @@ -46,8 +46,8 @@ def _match_query(query): try: key, value = query.split(':') - except: - raise ValueError('query format must be "key:value"') + except Exception as e: + raise ValueError('query format must be "key:value"') from e return {"query": {"match": {key: {'query': value}}}} @@ -71,8 +71,8 @@ def _term_query(query): try: key, value = query.split(':') - except: - raise ValueError('query format must be key:value') + except Exception as e: + raise ValueError('query format must be key:value') from e return {'query': {'term': {key: value}}} @@ -86,8 +86,8 @@ def _terms_query(query): try: key, values = query.split(':') - except: - raise ValueError('query format must be key:value1,value2') + except Exception as e: + raise ValueError('query format must be key:value1,value2') from e return {'query': {'terms': {key: values.split(',')}}} -- cgit v1.2.3