diff options
| author | Alexandre Flament <alex@al-f.net> | 2020-11-14 13:24:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-14 13:24:31 +0100 |
| commit | 102c08838b4f4afe044d8eafcc0de635f1401d35 (patch) | |
| tree | edbb5fb3132f161da8673c90ee8bf715c3a1e204 /searx | |
| parent | 46b454277f70cb504a1276286e07048b8a5651bf (diff) | |
| parent | 58d72f26925d56e22330c54be03c3dcbee0c4135 (diff) | |
| download | searxng-102c08838b4f4afe044d8eafcc0de635f1401d35.tar.gz searxng-102c08838b4f4afe044d8eafcc0de635f1401d35.zip | |
Merge pull request #2289 from dalf/pylint
[mod] pylint: add extension-pkg-whitelist=lxml.etree
Diffstat (limited to 'searx')
| -rw-r--r-- | searx/engines/qwant.py | 2 | ||||
| -rw-r--r-- | searx/engines/xpath.py | 1 | ||||
| -rwxr-xr-x | searx/webapp.py | 15 |
3 files changed, 8 insertions, 10 deletions
diff --git a/searx/engines/qwant.py b/searx/engines/qwant.py index 98460604c..c909ce11b 100644 --- a/searx/engines/qwant.py +++ b/searx/engines/qwant.py @@ -17,7 +17,7 @@ from searx.utils import html_to_text, match_language # engine dependent config -categories = None +categories = [] paging = True language_support = True supported_languages_url = 'https://qwant.com/region' diff --git a/searx/engines/xpath.py b/searx/engines/xpath.py index 81c2747fb..a569d9160 100644 --- a/searx/engines/xpath.py +++ b/searx/engines/xpath.py @@ -7,6 +7,7 @@ url_xpath = None content_xpath = None title_xpath = None thumbnail_xpath = False +categories = [] paging = False suggestion_xpath = '' results_xpath = '' diff --git a/searx/webapp.py b/searx/webapp.py index 9aa80906a..326200cec 100755 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -44,7 +44,7 @@ from urllib.parse import urlencode, urlparse, urljoin, urlsplit from pygments import highlight from pygments.lexers import get_lexer_by_name -from pygments.formatters import HtmlFormatter +from pygments.formatters import HtmlFormatter # pylint: disable=no-name-in-module from werkzeug.middleware.proxy_fix import ProxyFix from flask import ( @@ -111,7 +111,7 @@ app = Flask( app.jinja_env.trim_blocks = True app.jinja_env.lstrip_blocks = True -app.jinja_env.add_extension('jinja2.ext.loopcontrols') +app.jinja_env.add_extension('jinja2.ext.loopcontrols') # pylint: disable=no-member app.secret_key = settings['server']['secret_key'] # see https://flask.palletsprojects.com/en/1.1.x/cli/ @@ -589,15 +589,12 @@ def search(): result_container = search.search() + except SearxParameterException as e: + logger.exception('search error: SearxParameterException') + return index_error(output_format, e.message), 400 except Exception as e: - # log exception logger.exception('search error') - - # is it an invalid input parameter or something else ? - if (issubclass(e.__class__, SearxParameterException)): - return index_error(output_format, e.message), 400 - else: - return index_error(output_format, gettext('search error')), 500 + return index_error(output_format, gettext('search error')), 500 # results results = result_container.get_ordered_results() |