git.iko.soy/searx
on master help sign in
[fix] pylint: use "raise ... from ..."
3f8ebf7Alexandre Flament
searx/engines/elasticsearch.py+6−6
compare with master
unifiedsplit
@@ -46,8 +46,8 @@ def _match_query(query):
46
46
47 try:
47 try:
48 key, value = query.split(':')
48 key, value = query.split(':')
49− except:
49+ except Exception as e:
50− raise ValueError('query format must be "key:value"')
50+ raise ValueError('query format must be "key:value"') from e
51
51
52 return {"query": {"match": {key: {'query': value}}}}
52 return {"query": {"match": {key: {'query': value}}}}
53
53
@@ -71,8 +71,8 @@ def _term_query(query):
71
71
72 try:
72 try:
73 key, value = query.split(':')
73 key, value = query.split(':')
74− except:
74+ except Exception as e:
75− raise ValueError('query format must be key:value')
75+ raise ValueError('query format must be key:value') from e
76
76
77 return {'query': {'term': {key: value}}}
77 return {'query': {'term': {key: value}}}
78
78
@@ -86,8 +86,8 @@ def _terms_query(query):
86
86
87 try:
87 try:
88 key, values = query.split(':')
88 key, values = query.split(':')
89− except:
89+ except Exception as e:
90− raise ValueError('query format must be key:value1,value2')
90+ raise ValueError('query format must be key:value1,value2') from e
91
91
92 return {'query': {'terms': {key: values.split(',')}}}
92 return {'query': {'terms': {key: values.split(',')}}}
93
93
searx/settings_loader.py+2−2
@@ -24,9 +24,9 @@ def load_yaml(file_name):
24 with open(file_name, 'r', encoding='utf-8') as settings_yaml:
24 with open(file_name, 'r', encoding='utf-8') as settings_yaml:
25 return yaml.safe_load(settings_yaml)
25 return yaml.safe_load(settings_yaml)
26 except IOError as e:
26 except IOError as e:
27− raise SearxSettingsException(e, file_name)
27+ raise SearxSettingsException(e, file_name) from e
28 except yaml.YAMLError as e:
28 except yaml.YAMLError as e:
29− raise SearxSettingsException(e, file_name)
29+ raise SearxSettingsException(e, file_name) from e
30
30
31
31
32def get_default_settings_path():
32def get_default_settings_path():
searx/utils.py+2−2
@@ -522,7 +522,7 @@ def get_xpath(xpath_spec):
522 try:
522 try:
523 result = XPath(xpath_spec)
523 result = XPath(xpath_spec)
524 except XPathSyntaxError as e:
524 except XPathSyntaxError as e:
525− raise SearxXPathSyntaxException(xpath_spec, str(e.msg))
525+ raise SearxXPathSyntaxException(xpath_spec, str(e.msg)) from e
526 xpath_cache[xpath_spec] = result
526 xpath_cache[xpath_spec] = result
527 return result
527 return result
528
528
@@ -553,7 +553,7 @@ def eval_xpath(element, xpath_spec):
553 return xpath(element)
553 return xpath(element)
554 except XPathError as e:
554 except XPathError as e:
555 arg = ' '.join([str(i) for i in e.args])
555 arg = ' '.join([str(i) for i in e.args])
556− raise SearxEngineXPathException(xpath_spec, arg)
556+ raise SearxEngineXPathException(xpath_spec, arg) from e
557
557
558
558
559def eval_xpath_list(element, xpath_spec, min_len=None):
559def eval_xpath_list(element, xpath_spec, min_len=None):
searx/webadapter.py+2−2
@@ -105,8 +105,8 @@ def parse_timeout(form: Dict[str, str], raw_text_query: RawTextQuery) -> Optiona
105 return None
105 return None
106 try:
106 try:
107 return float(timeout_limit)
107 return float(timeout_limit)
108− except ValueError:
108+ except ValueError as e:
109− raise SearxParameterException('timeout_limit', timeout_limit)
109+ raise SearxParameterException('timeout_limit', timeout_limit) from e
110
110
111
111
112def parse_category_form(query_categories: List[str], name: str, value: str) -> None:
112def parse_category_form(query_categories: List[str], name: str, value: str) -> None: