From c749d1a09fce276b73ce4887e4fcdf3cb1ad5267 Mon Sep 17 00:00:00 2001 From: yuvipanda Date: Wed, 11 Jul 2018 18:58:11 -0700 Subject: [PATCH] Fix dictionary merging order We want to override defaults with config, not the other way around --- tljh/configurer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tljh/configurer.py b/tljh/configurer.py index 37699df..2954c43 100644 --- a/tljh/configurer.py +++ b/tljh/configurer.py @@ -41,7 +41,7 @@ def apply_yaml_config(path, c): if os.path.exists(path): with open(path) as f: # FIXME: Figure out correct order of merging here - tljh_config = _merge_dictionaries(yaml.safe_load(f), default) + tljh_config = _merge_dictionaries(dict(default), yaml.safe_load(f)) else: tljh_config = copy.deepcopy(default)