voussoir/voussoirkit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clarify variables.

Browse source
This commit is contained in:
voussoir 2021-09-30 16:19:30 -07:00
parent e273eb22a5
commit c1edd8fc33
No known key found for this signature in database
GPG key ID: 5F7554F8C26DACCB
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
voussoirkit/configlayers.py
View file

@ -68,7 +68,7 @@ def layer_json(target, supply):
recursive_dict_update(target=target, supply=supply) recursive_dict_update(target=target, supply=supply)
return (target, needs_rewrite) return (target, needs_rewrite)
def load_file(filepath, defaults): def load_file(filepath, default_config):
''' '''
Given a filepath to a user-supplied config file, and a dict of default Given a filepath to a user-supplied config file, and a dict of default
values, return a new dict containing the user-supplied values overlaid onto values, return a new dict containing the user-supplied values overlaid onto
@ -82,14 +82,14 @@ def load_file(filepath, defaults):
# defaults, so that as we go through the user's config we can overwrite the # defaults, so that as we go through the user's config we can overwrite the
# user-specified keys, and the keys which the user does not specify will # user-specified keys, and the keys which the user does not specify will
# remain default. # remain default.
config = copy.deepcopy(defaults) final_config = copy.deepcopy(default_config)
needs_rewrite = False needs_rewrite = False
if user_config_exists: if user_config_exists:
with path.open('r', encoding='utf-8') as handle: with path.open('r', encoding='utf-8') as handle:
user_config = json.load(handle) user_config = json.load(handle)
(config, needs_rewrite) = layer_json(config, user_config) (final_config, needs_rewrite) = layer_json(target=final_config, supply=user_config)
else: else:
needs_rewrite = True needs_rewrite = True
return (config, needs_rewrite) return (final_config, needs_rewrite)