Skip to content

Commit f500981

Browse files
mlucoolMarc Udoff
andauthored
Support for overrides.json5 (#179)
This adds support for the json5 format for setting overrides. It will look for overrides.json then overrides.json5. Both can be in json5 (of which JSON is a subset) Fixes: jupyterlab/jupyterlab#10010 Co-authored-by: Marc Udoff <[email protected]>
1 parent 1d6ea50 commit f500981

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

jupyterlab_server/settings_handler.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,12 @@ def _get_overrides(app_settings_dir):
259259
"""Get overrides settings from `app_settings_dir`."""
260260
overrides, error = {}, ""
261261
overrides_path = os.path.join(app_settings_dir, 'overrides.json')
262+
if not os.path.exists(overrides_path):
263+
overrides_path = os.path.join(app_settings_dir, 'overrides.json5')
262264
if os.path.exists(overrides_path):
263265
with open(overrides_path, encoding='utf-8') as fid:
264266
try:
265-
overrides = json.load(fid)
267+
overrides = json5.load(fid)
266268
except Exception as e:
267269
error = e
268270
# Allow `default_settings_overrides.json` files in <jupyter_config>/labconfig dirs

0 commit comments

Comments
 (0)