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

single yaml implementation

Browse Source 
consolidate to a single yaml implementation,
removing pyyaml
This commit is contained in:
Min RK
2019-02-11 13:27:08 +01:00
parent d3af75a1d7
commit 13648050ae
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tljh/configurer.py
View File

@@ -9,9 +9,9 @@ FIXME: A strong feeling that JSON Schema should be involved somehow.
"""
import os
import yaml
from tljh.config import CONFIG_FILE
from .config import CONFIG_FILE
from .yaml import yaml
# Default configuration for tljh
# User provided config is merged into this
@@ -59,7 +59,7 @@ def load_config(config_file=CONFIG_FILE):
"""
if os.path.exists(config_file):
with open(config_file) as f:
config_overrides = yaml.safe_load(f)
config_overrides = yaml.load(f)
else:
config_overrides = {}
return _merge_dictionaries(dict(default), config_overrides)