openstack
/
shade
Code Issues Proposed changes

Replace six.iteritems() with .items() 

1.As mentioned in [1], we should avoid usingg
six.iteritems to achieve iterators. We can
use dict.items instead, as it will return
iterators in PY3 as well. And dict.items/keys
will more readable. 2.In py2, the performance
about list should be negligible, see the link [2].
[1] https://wiki.openstack.org/wiki/Python3
[2] http://lists.openstack.org/pipermail/openstack-dev/2015-June/066391.html

Change-Id: Iffdaadabccd6314643f668147f486103378a55eb
This commit is contained in:
rajat29 2017-06-14 11:45:44 +05:30
parent cb70320595
commit 3bb46e4f7f
1 changed files with 2 additions and 2 deletions
Show Stats 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,