diff options
| author | dixiaoli <dixiaobj@cn.ibm.com> | 2015-11-22 15:45:26 +0000 |
|---|---|---|
| committer | dixiaoli <dixiaobj@cn.ibm.com> | 2015-11-22 15:53:59 +0000 |
| commit | b2619a9e65ddb543f9cbf8b87bedaafdbc4d899c (patch) | |
| tree | 5e58deb8051ad7cec6c471acb1df37bc135b53e6 /heatclient/common/template_utils.py | |
| parent | 681e5e12bdb536edc3390eee0d4b9db2f9ff78b2 (diff) | |
| download | python-heatclient-b2619a9e65ddb543f9cbf8b87bedaafdbc4d899c.tar.gz | |
Use six.iteritems() instead of iter(XXX.items())
This patch changes the method iter(XXX.items()) to six.iteritems()
Change-Id: I178cfae85e0c128633f30236da565be8b2c7acc1
Diffstat (limited to 'heatclient/common/template_utils.py')
| -rw-r--r-- | heatclient/common/template_utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/heatclient/common/template_utils.py b/heatclient/common/template_utils.py index e71a3b1..6d58b99 100644 --- a/heatclient/common/template_utils.py +++ b/heatclient/common/template_utils.py @@ -112,7 +112,7 @@ def get_file_contents(from_data, files, base_url=None, get_file_contents(value, files, base_url, ignore_if, recurse_if) if isinstance(from_data, dict): - for key, value in iter(from_data.items()): + for key, value in six.iteritems(from_data): if ignore_if and ignore_if(key, value): continue @@ -218,7 +218,7 @@ def resolve_environment_urls(resource_registry, files, env_base_url): get_file_contents(rr, files, base_url, ignore_if) - for res_name, res_dict in iter(rr.get('resources', {}).items()): + for res_name, res_dict in six.iteritems(rr.get('resources', {})): res_base_url = res_dict.get('base_url', base_url) get_file_contents( res_dict, files, res_base_url, ignore_if) |