phosphor-settingsd: srcrev bump 3d805fe94a..6f62cc844b
And convert recipe to python3.
Patrick Williams (3):
python2 to python3 conversion
MAINTAINERS: update Deepak's email address
delete deprecated python scripts
Change-Id: Ie00a27d4e8355307977ab1de12376b2879c0994f
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
diff --git a/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py b/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py
index 01f5e35..d910da5 100755
--- a/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py
+++ b/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 @@
"""
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: