git.iko.soy/searx
on master help sign in
[fix] pylint: use "raise ... from ..."
commit3f8ebf70b193f4391a01d7412324a10e4faa56a2 authorAlexandre Flament <alex@al-f.net> dateThu 17 Dec 2020, 09:57 (6 years ago) parenteb33ae6
4 files changed+12−12
compare with master
unifiedsplit
searx/engines/elasticsearch.py+6−6 searx/settings_loader.py+2−2 searx/utils.py+2−2 searx/webadapter.py+2−2
searx/engines/elasticsearch.py+6−6
@@ -46,8 +46,8 @@ def _match_query(query):
4646
4747 try:
4848 key, value = query.split(':')
49− except:
50− raise ValueError('query format must be "key:value"')
49+ except Exception as e:
50+ raise ValueError('query format must be "key:value"') from e
5151
5252 return {"query": {"match": {key: {'query': value}}}}
5353
@@ -71,8 +71,8 @@ def _term_query(query):
7171
7272 try:
7373 key, value = query.split(':')
74− except:
75− raise ValueError('query format must be key:value')
74+ except Exception as e:
75+ raise ValueError('query format must be key:value') from e
7676
7777 return {'query': {'term': {key: value}}}
7878
@@ -86,8 +86,8 @@ def _terms_query(query):
8686
8787 try:
8888 key, values = query.split(':')
89− except:
90− raise ValueError('query format must be key:value1,value2')
89+ except Exception as e:
90+ raise ValueError('query format must be key:value1,value2') from e
9191
9292 return {'query': {'terms': {key: values.split(',')}}}
9393
searx/settings_loader.py+2−2
@@ -24,9 +24,9 @@ def load_yaml(file_name):
2424 with open(file_name, 'r', encoding='utf-8') as settings_yaml:
2525 return yaml.safe_load(settings_yaml)
2626 except IOError as e:
27− raise SearxSettingsException(e, file_name)
27+ raise SearxSettingsException(e, file_name) from e
2828 except yaml.YAMLError as e:
29− raise SearxSettingsException(e, file_name)
29+ raise SearxSettingsException(e, file_name) from e
3030
3131
3232def get_default_settings_path():
searx/utils.py+2−2
@@ -522,7 +522,7 @@ def get_xpath(xpath_spec):
522522 try:
523523 result = XPath(xpath_spec)
524524 except XPathSyntaxError as e:
525− raise SearxXPathSyntaxException(xpath_spec, str(e.msg))
525+ raise SearxXPathSyntaxException(xpath_spec, str(e.msg)) from e
526526 xpath_cache[xpath_spec] = result
527527 return result
528528
@@ -553,7 +553,7 @@ def eval_xpath(element, xpath_spec):
553553 return xpath(element)
554554 except XPathError as e:
555555 arg = ' '.join([str(i) for i in e.args])
556− raise SearxEngineXPathException(xpath_spec, arg)
556+ raise SearxEngineXPathException(xpath_spec, arg) from e
557557
558558
559559def 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
105105 return None
106106 try:
107107 return float(timeout_limit)
108− except ValueError:
109− raise SearxParameterException('timeout_limit', timeout_limit)
108+ except ValueError as e:
109+ raise SearxParameterException('timeout_limit', timeout_limit) from e
110110
111111
112112def parse_category_form(query_categories: List[str], name: str, value: str) -> None: