summaryrefslogtreecommitdiff
path: root/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py
diff options
context:
space:
mode:
Diffstat (limited to 'meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py')
-rwxr-xr-xmeta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py
index 01f5e3552..d910da5ba 100755
--- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py
+++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""Loads a "target" YAML file and overwrites its values with values from
"override" YAML files.
@@ -28,7 +28,7 @@ def dict_merge(target, source):
"""
if not isinstance(source, dict):
return source
- for k, v in source.iteritems():
+ for k, v in source.items():
if k in target and isinstance(target[k], dict):
dict_merge(target[k], v)
else: