jandieman/searxng
2
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2025-12-22 19:50:00 +00:00
Code Issues Projects Releases Wiki Activity

[format.python] initial formatting of the python code

Browse Source 
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>
This commit is contained in:
Markus Heiser
2021-12-27 09:26:22 +01:00
parent fcdc2c2cd2
commit 3d96a9839a
184 changed files with 2800 additions and 2836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
searx/settings_loader.py
View File

@@ -125,8 +125,7 @@ def load_settings(load_user_setttings=True):
user_settings_path = get_user_settings_path()
if user_settings_path is None or not load_user_setttings:
# no user settings
return (load_yaml(default_settings_path),
'load the default settings from {}'.format(default_settings_path))
return (load_yaml(default_settings_path), 'load the default settings from {}'.format(default_settings_path))
# user settings
user_settings = load_yaml(user_settings_path)
@@ -134,10 +133,12 @@ def load_settings(load_user_setttings=True):
# the user settings are merged with the default configuration
default_settings = load_yaml(default_settings_path)
update_settings(default_settings, user_settings)
return (default_settings,
'merge the default settings ( {} ) and the user setttings ( {} )'
.format(default_settings_path, user_settings_path))
return (
default_settings,
'merge the default settings ( {} ) and the user setttings ( {} )'.format(
default_settings_path, user_settings_path
),
)
# the user settings, fully replace the default configuration
return (user_settings,
'load the user settings from {}'.format(user_settings_path))
return (user_settings, 'load the user settings from {}'.format(user_settings_path))