From b48ac505fdc447f1c8a2d9cc6e147ff21461396d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 14 Nov 2014 10:42:02 +0100 Subject: [PATCH] Allow to fetch whole tree from the settings merged with the defaults --- src/octoprint/settings.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py index ff05e9d3..05fe60dd 100644 --- a/src/octoprint/settings.py +++ b/src/octoprint/settings.py @@ -439,7 +439,9 @@ class Settings(object): #~~ getter - def get(self, path, asdict=False, defaults=None): + def get(self, path, asdict=False, defaults=None, merged=False): + import octoprint.util as util + if len(path) == 0: return None @@ -471,6 +473,8 @@ class Settings(object): for key in keys: if key in config.keys(): value = config[key] + if merged and key in defaults: + value = util.dict_merge(defaults[key], value) elif key in defaults: value = defaults[key] else: