mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-07 17:24:17 +00:00
Code Activity

Removing redundant path existence checks in _load_yaml and _import_sub

Browse Source
This commit is contained in:
Davide Laezza
2020-03-22 12:50:02 +01:00
parent e53a7d5229
commit f26cd16dfe
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dotdrop/cfg_yaml.py
View File

@@ -754,10 +754,7 @@ class CfgYaml:
""" """
if self.debug: if self.debug:
self.log.dbg('import \"{}\" from \"{}\"'.format(key, path)) self.log.dbg('import \"{}\" from \"{}\"'.format(key, path))
fnf = self.key_import_fatal_not_found extdict = self._load_yaml(path)
extdict = self._load_yaml(path, fatal_not_found=fnf)
if extdict is None and not self.key_import_fatal_not_found:
return {}
new = self._get_entry(extdict, key, mandatory=mandatory) new = self._get_entry(extdict, key, mandatory=mandatory)
if patch_func: if patch_func:
if self.debug: if self.debug:
@@ -967,16 +964,9 @@ class CfgYaml:
"""dump the config dictionary""" """dump the config dictionary"""
return self.yaml_dict return self.yaml_dict
def _load_yaml(self, path, fatal_not_found=True): def _load_yaml(self, path):
"""load a yaml file to a dict""" """load a yaml file to a dict"""
content = {} content = {}
if not os.path.exists(path):
err = 'config path not found: {}'.format(path)
if fatal_not_found:
raise YamlException(err)
else:
self.log.warn(err)
return None
try: try:
content = self._yaml_load(path) content = self._yaml_load(path)
except Exception as e: except Exception as e: