zhangyiss/the-littlest-jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/the-littlest-jupyterhub.git synced 2025-12-18 21:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix dictionary merging order

Browse Source 
We want to override defaults with config, not the other way around
This commit is contained in:
yuvipanda
2018-07-11 18:58:11 -07:00
parent 6d3efffcb5
commit c749d1a09f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tljh/configurer.py
View File

@@ -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)