git.iko.soy/searx
on master help sign in
Merge pull request #2289 from dalf/pylint
102c088Alexandre Flament
.pylintrc+1−1
compare with master
unifiedsplit
@@ -12,7 +12,7 @@
12# A comma-separated list of package or module names from where C extensions may
12# A comma-separated list of package or module names from where C extensions may
13# be loaded. Extensions are loading into the active Python interpreter and may
13# be loaded. Extensions are loading into the active Python interpreter and may
14# run arbitrary code
14# run arbitrary code
15−extension-pkg-whitelist=
15+extension-pkg-whitelist=lxml.etree
16
16
17# Add files or directories to the blacklist. They should be base names, not
17# Add files or directories to the blacklist. They should be base names, not
18# paths.
18# paths.
searx/engines/qwant.py+1−1
@@ -17,7 +17,7 @@ from searx.utils import html_to_text, match_language
17
17
18
18
19# engine dependent config
19# engine dependent config
20−categories = None
20+categories = []
21paging = True
21paging = True
22language_support = True
22language_support = True
23supported_languages_url = 'https://qwant.com/region'
23supported_languages_url = 'https://qwant.com/region'
searx/engines/xpath.py+1
@@ -7,6 +7,7 @@ url_xpath = None
7content_xpath = None
7content_xpath = None
8title_xpath = None
8title_xpath = None
9thumbnail_xpath = False
9thumbnail_xpath = False
10+categories = []
10paging = False
11paging = False
11suggestion_xpath = ''
12suggestion_xpath = ''
12results_xpath = ''
13results_xpath = ''
searx/webapp.py+6−9
@@ -44,7 +44,7 @@ from urllib.parse import urlencode, urlparse, urljoin, urlsplit
44
44
45from pygments import highlight
45from pygments import highlight
46from pygments.lexers import get_lexer_by_name
46from pygments.lexers import get_lexer_by_name
47−from pygments.formatters import HtmlFormatter
47+from pygments.formatters import HtmlFormatter # pylint: disable=no-name-in-module
48
48
49from werkzeug.middleware.proxy_fix import ProxyFix
49from werkzeug.middleware.proxy_fix import ProxyFix
50from flask import (
50from flask import (
@@ -111,7 +111,7 @@ app = Flask(
111
111
112app.jinja_env.trim_blocks = True
112app.jinja_env.trim_blocks = True
113app.jinja_env.lstrip_blocks = True
113app.jinja_env.lstrip_blocks = True
114−app.jinja_env.add_extension('jinja2.ext.loopcontrols')
114+app.jinja_env.add_extension('jinja2.ext.loopcontrols') # pylint: disable=no-member
115app.secret_key = settings['server']['secret_key']
115app.secret_key = settings['server']['secret_key']
116
116
117# see https://flask.palletsprojects.com/en/1.1.x/cli/
117# see https://flask.palletsprojects.com/en/1.1.x/cli/
@@ -589,15 +589,12 @@ def search():
589
589
590 result_container = search.search()
590 result_container = search.search()
591
591
592+ except SearxParameterException as e:
593+ logger.exception('search error: SearxParameterException')
594+ return index_error(output_format, e.message), 400
592 except Exception as e:
595 except Exception as e:
593− # log exception
594 logger.exception('search error')
596 logger.exception('search error')
595−
596− # is it an invalid input parameter or something else ?
597− if (issubclass(e.__class__, SearxParameterException)):
598− return index_error(output_format, e.message), 400
599− else:
600− return index_error(output_format, gettext('search error')), 500
597+ return index_error(output_format, gettext('search error')), 500
601
598
602 # results
599 # results
603 results = result_container.get_ordered_results()
600 results = result_container.get_ordered_results()