Browse Source

[fix] pylint: use "raise ... from ..."

Alexandre Flament 4 years ago
parent
commit
3f8ebf70b1
4 changed files with 12 additions and 12 deletions
  1. 6 6
      searx/engines/elasticsearch.py
  2. 2 2
      searx/settings_loader.py
  3. 2 2
      searx/utils.py
  4. 2 2
      searx/webadapter.py

+ 6 - 6
searx/engines/elasticsearch.py

@@ -46,8 +46,8 @@ def _match_query(query):
 
     try:
         key, value = query.split(':')
-    except:
-        raise ValueError('query format must be "key:value"')
+    except Exception as e:
+        raise ValueError('query format must be "key:value"') from e
 
     return {"query": {"match": {key: {'query': value}}}}
 
@@ -71,8 +71,8 @@ def _term_query(query):
 
     try:
         key, value = query.split(':')
-    except:
-        raise ValueError('query format must be key:value')
+    except Exception as e:
+        raise ValueError('query format must be key:value') from e
 
     return {'query': {'term': {key: value}}}
 
@@ -86,8 +86,8 @@ def _terms_query(query):
 
     try:
         key, values = query.split(':')
-    except:
-        raise ValueError('query format must be key:value1,value2')
+    except Exception as e:
+        raise ValueError('query format must be key:value1,value2') from e
 
     return {'query': {'terms': {key: values.split(',')}}}
 

+ 2 - 2
searx/settings_loader.py

@@ -24,9 +24,9 @@ def load_yaml(file_name):
         with open(file_name, 'r', encoding='utf-8') as settings_yaml:
             return yaml.safe_load(settings_yaml)
     except IOError as e:
-        raise SearxSettingsException(e, file_name)
+        raise SearxSettingsException(e, file_name) from e
     except yaml.YAMLError as e:
-        raise SearxSettingsException(e, file_name)
+        raise SearxSettingsException(e, file_name) from e
 
 
 def get_default_settings_path():

+ 2 - 2
searx/utils.py

@@ -522,7 +522,7 @@ def get_xpath(xpath_spec):
             try:
                 result = XPath(xpath_spec)
             except XPathSyntaxError as e:
-                raise SearxXPathSyntaxException(xpath_spec, str(e.msg))
+                raise SearxXPathSyntaxException(xpath_spec, str(e.msg)) from e
             xpath_cache[xpath_spec] = result
         return result
 
@@ -553,7 +553,7 @@ def eval_xpath(element, xpath_spec):
         return xpath(element)
     except XPathError as e:
         arg = ' '.join([str(i) for i in e.args])
-        raise SearxEngineXPathException(xpath_spec, arg)
+        raise SearxEngineXPathException(xpath_spec, arg) from e
 
 
 def eval_xpath_list(element, xpath_spec, min_len=None):

+ 2 - 2
searx/webadapter.py

@@ -105,8 +105,8 @@ def parse_timeout(form: Dict[str, str], raw_text_query: RawTextQuery) -> Optiona
         return None
     try:
         return float(timeout_limit)
-    except ValueError:
-        raise SearxParameterException('timeout_limit', timeout_limit)
+    except ValueError as e:
+        raise SearxParameterException('timeout_limit', timeout_limit) from e
 
 
 def parse_category_form(query_categories: List[str], name: str, value: str) -> None: