From fcdc2c2cd26e24c2aa3f064d93cee3e29dc2a30c Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Mon, 27 Dec 2021 09:16:03 +0100
Subject: [format.python] disable py code formatting for some hunks of code

Disable the python code formatting from python-black, where the readability of
code suffers by formatting.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/search/processors/online.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'searx/search/processors')

diff --git a/searx/search/processors/online.py b/searx/search/processors/online.py
index c4ee58e11..674ba9c8e 100644
--- a/searx/search/processors/online.py
+++ b/searx/search/processors/online.py
@@ -23,6 +23,7 @@ from .abstract import EngineProcessor
 def default_request_params():
     """Default request parameters for ``online`` engines."""
     return {
+        # fmt: off
         'method': 'GET',
         'headers': {},
         'data': {},
@@ -30,6 +31,7 @@ def default_request_params():
         'cookies': {},
         'verify': True,
         'auth': None
+        # fmt: on
     }
 
 
-- 
cgit v1.2.3


From 3d96a9839a12649874b6d4cf9466bd3616b0a03c Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Mon, 27 Dec 2021 09:26:22 +0100
Subject: [format.python] initial formatting of the python code

This patch was generated by black [1]::

    make format.python

[1] https://github.com/psf/black

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/search/processors/__init__.py          |  1 +
 searx/search/processors/abstract.py          | 13 ++++----
 searx/search/processors/offline.py           |  2 +-
 searx/search/processors/online.py            | 45 ++++++++++------------------
 searx/search/processors/online_currency.py   |  4 +++
 searx/search/processors/online_dictionary.py |  6 ++--
 6 files changed, 33 insertions(+), 38 deletions(-)

(limited to 'searx/search/processors')

diff --git a/searx/search/processors/__init__.py b/searx/search/processors/__init__.py
index 8108f8dfa..966b990ec 100644
--- a/searx/search/processors/__init__.py
+++ b/searx/search/processors/__init__.py
@@ -29,6 +29,7 @@ logger = logger.getChild('search.processors')
 PROCESSORS = {}
 """Cache request processores, stored by *engine-name* (:py:func:`initialize`)"""
 
+
 def get_processor_class(engine_type):
     """Return processor class according to the ``engine_type``"""
     for c in [OnlineProcessor, OfflineProcessor, OnlineDictionaryProcessor, OnlineCurrencyProcessor]:
diff --git a/searx/search/processors/abstract.py b/searx/search/processors/abstract.py
index b5fa063fd..732b55d52 100644
--- a/searx/search/processors/abstract.py
+++ b/searx/search/processors/abstract.py
@@ -19,6 +19,7 @@ from searx.utils import get_engine_from_settings
 logger = logger.getChild('searx.search.processor')
 SUSPENDED_STATUS = {}
 
+
 class SuspendedStatus:
     """Class to handle suspend state."""
 
@@ -39,8 +40,10 @@ class SuspendedStatus:
             # update continuous_errors / suspend_end_time
             self.continuous_errors += 1
             if suspended_time is None:
-                suspended_time = min(settings['search']['max_ban_time_on_fail'],
-                                     self.continuous_errors * settings['search']['ban_time_on_fail'])
+                suspended_time = min(
+                    settings['search']['max_ban_time_on_fail'],
+                    self.continuous_errors * settings['search']['ban_time_on_fail'],
+                )
             self.suspend_end_time = default_timer() + suspended_time
             self.suspend_reason = suspend_reason
             logger.debug('Suspend for %i seconds', suspended_time)
@@ -127,9 +130,9 @@ class EngineProcessor(ABC):
 
     def extend_container_if_suspended(self, result_container):
         if self.suspended_status.is_suspended:
-            result_container.add_unresponsive_engine(self.engine_name,
-                                                     self.suspended_status.suspend_reason,
-                                                     suspended=True)
+            result_container.add_unresponsive_engine(
+                self.engine_name, self.suspended_status.suspend_reason, suspended=True
+            )
             return True
         return False
 
diff --git a/searx/search/processors/offline.py b/searx/search/processors/offline.py
index ec7a4a36e..13f077cb1 100644
--- a/searx/search/processors/offline.py
+++ b/searx/search/processors/offline.py
@@ -23,6 +23,6 @@ class OfflineProcessor(EngineProcessor):
         except ValueError as e:
             # do not record the error
             self.logger.exception('engine {0} : invalid input : {1}'.format(self.engine_name, e))
-        except Exception as e: # pylint: disable=broad-except
+        except Exception as e:  # pylint: disable=broad-except
             self.handle_exception(result_container, e)
             self.logger.exception('engine {0} : exception : {1}'.format(self.engine_name, e))
diff --git a/searx/search/processors/online.py b/searx/search/processors/online.py
index 674ba9c8e..8d8275df1 100644
--- a/searx/search/processors/online.py
+++ b/searx/search/processors/online.py
@@ -66,10 +66,7 @@ class OnlineProcessor(EngineProcessor):
         # create dictionary which contain all
         # informations about the request
         request_args = dict(
-            headers=params['headers'],
-            cookies=params['cookies'],
-            verify=params['verify'],
-            auth=params['auth']
+            headers=params['headers'], cookies=params['cookies'], verify=params['verify'], auth=params['auth']
         )
 
         # max_redirects
@@ -105,10 +102,12 @@ class OnlineProcessor(EngineProcessor):
             status_code = str(response.status_code or '')
             reason = response.reason_phrase or ''
             hostname = response.url.host
-            count_error(self.engine_name,
-                        '{} redirects, maximum: {}'.format(len(response.history), soft_max_redirects),
-                        (status_code, reason, hostname),
-                        secondary=True)
+            count_error(
+                self.engine_name,
+                '{} redirects, maximum: {}'.format(len(response.history), soft_max_redirects),
+                (status_code, reason, hostname),
+                secondary=True,
+            )
 
         return response
 
@@ -147,22 +146,16 @@ class OnlineProcessor(EngineProcessor):
             # requests timeout (connect or read)
             self.handle_exception(result_container, e, suspend=True)
             self.logger.error(
-                "HTTP requests timeout (search duration : {0} s, timeout: {1} s) : {2}"
-                .format(
-                    default_timer() - start_time,
-                    timeout_limit,
-                    e.__class__.__name__
+                "HTTP requests timeout (search duration : {0} s, timeout: {1} s) : {2}".format(
+                    default_timer() - start_time, timeout_limit, e.__class__.__name__
                 )
             )
         except (httpx.HTTPError, httpx.StreamError) as e:
             # other requests exception
             self.handle_exception(result_container, e, suspend=True)
             self.logger.exception(
-                "requests exception (search duration : {0} s, timeout: {1} s) : {2}"
-                .format(
-                    default_timer() - start_time,
-                    timeout_limit,
-                    e
+                "requests exception (search duration : {0} s, timeout: {1} s) : {2}".format(
+                    default_timer() - start_time, timeout_limit, e
                 )
             )
         except SearxEngineCaptchaException as e:
@@ -188,10 +181,9 @@ class OnlineProcessor(EngineProcessor):
 
         if getattr(self.engine, 'paging', False):
             tests['paging'] = {
-                'matrix': {'query': 'time',
-                           'pageno': (1, 2, 3)},
+                'matrix': {'query': 'time', 'pageno': (1, 2, 3)},
                 'result_container': ['not_empty'],
-                'test': ['unique_results']
+                'test': ['unique_results'],
             }
             if 'general' in self.engine.categories:
                 # avoid documentation about HTML tags (<time> and <input type="time">)
@@ -199,10 +191,9 @@ class OnlineProcessor(EngineProcessor):
 
         if getattr(self.engine, 'time_range', False):
             tests['time_range'] = {
-                'matrix': {'query': 'news',
-                           'time_range': (None, 'day')},
+                'matrix': {'query': 'news', 'time_range': (None, 'day')},
                 'result_container': ['not_empty'],
-                'test': ['unique_results']
+                'test': ['unique_results'],
             }
 
         if getattr(self.engine, 'supported_languages', []):
@@ -216,10 +207,6 @@ class OnlineProcessor(EngineProcessor):
             }
 
         if getattr(self.engine, 'safesearch', False):
-            tests['safesearch'] = {
-                'matrix': {'query': 'porn',
-                           'safesearch': (0, 2)},
-                'test': ['unique_results']
-            }
+            tests['safesearch'] = {'matrix': {'query': 'porn', 'safesearch': (0, 2)}, 'test': ['unique_results']}
 
         return tests
diff --git a/searx/search/processors/online_currency.py b/searx/search/processors/online_currency.py
index 4e5c57264..6bd891b1d 100644
--- a/searx/search/processors/online_currency.py
+++ b/searx/search/processors/online_currency.py
@@ -12,11 +12,13 @@ from .online import OnlineProcessor
 
 parser_re = re.compile('.*?(\\d+(?:\\.\\d+)?) ([^.0-9]+) (?:in|to) ([^.0-9]+)', re.I)
 
+
 def normalize_name(name):
     name = name.lower().replace('-', ' ').rstrip('s')
     name = re.sub(' +', ' ', name)
     return unicodedata.normalize('NFKD', name).lower()
 
+
 def name_to_iso4217(name):
     name = normalize_name(name)
     currency = CURRENCIES['names'].get(name, [name])
@@ -24,9 +26,11 @@ def name_to_iso4217(name):
         return currency
     return currency[0]
 
+
 def iso4217_to_name(iso4217, language):
     return CURRENCIES['iso4217'].get(iso4217, {}).get(language, iso4217)
 
+
 class OnlineCurrencyProcessor(OnlineProcessor):
 
     """Processor class used by ``online_currency`` engines."""
diff --git a/searx/search/processors/online_dictionary.py b/searx/search/processors/online_dictionary.py
index 72941d57a..3e7f6ed59 100644
--- a/searx/search/processors/online_dictionary.py
+++ b/searx/search/processors/online_dictionary.py
@@ -11,6 +11,7 @@ from .online import OnlineProcessor
 
 parser_re = re.compile('.*?([a-z]+)-([a-z]+) ([^ ]+)$', re.I)
 
+
 class OnlineDictionaryProcessor(OnlineProcessor):
     """Processor class used by ``online_dictionary`` engines."""
 
@@ -44,10 +45,9 @@ class OnlineDictionaryProcessor(OnlineProcessor):
 
         if getattr(self.engine, 'paging', False):
             tests['translation_paging'] = {
-                'matrix': {'query': 'en-es house',
-                           'pageno': (1, 2, 3)},
+                'matrix': {'query': 'en-es house', 'pageno': (1, 2, 3)},
                 'result_container': ['not_empty', ('one_title_contains', 'house')],
-                'test': ['unique_results']
+                'test': ['unique_results'],
             }
         else:
             tests['translation'] = {
-- 
cgit v1.2.3