Merge branch 'master' of https://github.com/asciimoo/searx into boilerplate

This commit is contained in:
Markus Heiser 2019-11-28 20:38:29 +01:00
commit 147f40c386
3 changed files with 9 additions and 3 deletions

View File

@ -10,7 +10,10 @@
@parse url, title, content, thumbnail, img_src @parse url, title, content, thumbnail, img_src
""" """
try:
from cgi import escape from cgi import escape
except:
from html import escape
from lxml import html from lxml import html
from searx.engines.xpath import extract_text from searx.engines.xpath import extract_text
from searx.url_utils import urljoin, urlencode from searx.url_utils import urljoin, urlencode

View File

@ -744,7 +744,7 @@ engines:
title_xpath : ./h2 title_xpath : ./h2
content_xpath : ./p[@class="s"] content_xpath : ./p[@class="s"]
suggestion_xpath : /html/body//div[@class="top-info"]/p[@class="top-info spell"]/a suggestion_xpath : /html/body//div[@class="top-info"]/p[@class="top-info spell"]/a
first_page_num : 1 first_page_num : 0
page_size : 10 page_size : 10
disabled : True disabled : True

View File

@ -41,7 +41,10 @@ except:
logger.critical("cannot import dependency: pygments") logger.critical("cannot import dependency: pygments")
from sys import exit from sys import exit
exit(1) exit(1)
try:
from cgi import escape from cgi import escape
except:
from html import escape
from datetime import datetime, timedelta from datetime import datetime, timedelta
from time import time from time import time
from werkzeug.contrib.fixers import ProxyFix from werkzeug.contrib.fixers import ProxyFix