openstack/shade
Code Issues Proposed changes

Merge "Replace six.iteritems() with .items()"

Browse Source
This commit is contained in:
Jenkins
2017-06-14 12:47:30 +00:00
committed by Gerrit Code Review
parent 19cddb5591 3bb46e4f7f
commit 476fe5a2ac
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shade/_heat/template_utils.py
View File

@@ -115,7 +115,7 @@ def get_file_contents(from_data, files, base_url=None,
is_object, object_request)
if isinstance(from_data, dict):
for key, value in six.iteritems(from_data):
for key, value in from_data.items():
if ignore_if and ignore_if(key, value):
continue
@@ -307,7 +307,7 @@ def resolve_environment_urls(resource_registry, files, env_base_url,
get_file_contents(rr, files, base_url, ignore_if,
is_object=is_object, object_request=object_request)
for res_name, res_dict in six.iteritems(rr.get('resources', {})):
for res_name, res_dict in rr.get('resources', {}).items():
res_base_url = res_dict.get('base_url', base_url)
get_file_contents(
res_dict, files, res_base_url, ignore_if,