openstack
/
openstack-ansible-plugins
Code Issues Proposed changes

config_template python 3 compatibility 

d.iteritems() -> d.items()

Refs:
http://legacy.python.org/dev/peps/pep-0469/
https://stackoverflow.com/questions/10458437/what-is-the-difference-between-dict-items-and-dict-iteritems
https://stackoverflow.com/questions/24189379/what-is-the-advantage-of-iteritems

Change-Id: Ie5a46ddea8927e4c6d585789fcc8a552943106be
This commit is contained in:
Logan V 2017-07-27 23:02:34 -05:00
parent d7e23e1be8
commit 2a286fb0fb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
action/_v2_config_template.py
View File

@ -58,7 +58,7 @@ def _convert_2_string(item):
# Old style dict comprehension for legacy python support
return dict(
(_convert_2_string(key), _convert_2_string(value))
for key, value in item.iteritems()
for key, value in item.items()
)
elif isinstance(item, list):
return [_convert_2_string(i) for i in item]
@ -414,7 +414,7 @@ class ActionModule(ActionBase):
:param new_items: ``dict``
:returns: ``dict``
"""
for key, value in new_items.iteritems():
for key, value in new_items.items():
if isinstance(value, dict):
base_items[key] = self._merge_dict(
base_items=base_items.get(key, {}),