pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow to fetch whole tree from the settings merged with the defaults

Browse source
This commit is contained in:
Gina Häußge 2014-11-14 10:42:02 +01:00
parent 947de33b5a
commit b48ac505fd
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/octoprint/settings.py
View file

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