summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-22 04:09:46 +0000
committerGerrit Code Review <review@openstack.org>2017-04-22 04:09:46 +0000
commit4bfd7b2327d73fb1ec77c56bb498d6f0e62cfbc2 (patch)
treef6a828756874f7c3d6046d56342427d92bdfdf2d /tools
parentc1b8d488d525223b84d25543e4e75d286ef4d10d (diff)
parentd72b0b9fac9b5a79a9a156b493d36395743dc5a7 (diff)
Merge "Replace six.iteritems() with .items()"
Diffstat (limited to 'tools')
-rwxr-xr-xtools/yaml-nic-config-2-script.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/yaml-nic-config-2-script.py b/tools/yaml-nic-config-2-script.py
index b8f07e4f..cdda108f 100755
--- a/tools/yaml-nic-config-2-script.py
+++ b/tools/yaml-nic-config-2-script.py
@@ -157,7 +157,7 @@ def convert(filename):
print("Error couldn't find run-os-net-config.sh relative to filename")
exit_usage()
- for r in six.iteritems(tpl.get('resources', {})):
+ for r in (tpl.get('resources', {})).items():
if (r[1].get('type') == 'OS::Heat::StructuredConfig' and
r[1].get('properties', {}).get('group') == 'os-apply-config' and
r[1].get('properties', {}).get('config', {}).get('os_net_config')):