Drop python 2 support from action plugins

These are executed on the local host where we run ansible-playbook,
and we have agreed to drop Python 2 support there.

Partially Implements: blueprint drop-py2-support
Change-Id: Id2190c3a22a56f4f048afbf0f7200daa8f41a292

2 files changed, 3 insertions, 4 deletions

diff --git a/ansible/action_plugins/merge_configs.py b/ansible/action_plugins/merge_configs.py
index d2c0684bf..54463e653 100644
--- a/ansible/action_plugins/merge_configs.py
+++ b/ansible/action_plugins/merge_configs.py
@@ -22,7 +22,7 @@ import tempfile
 
 from ansible import constants
 from ansible.plugins import action
-from six import StringIO
+from io import StringIO
 
 from oslo_config import iniparser
 
@@ -112,7 +112,7 @@ class OverrideConfigParser(iniparser.BaseParser):
                     if index == 0:
                         fp.write('{} = {}\n'.format(key, value))
                     else:
-                        fp.write('{}   {}\n'.format(len(key)*' ', value))
+                        fp.write('{}   {}\n'.format(len(key) * ' ', value))
 
         def write_section(section):
             for key, values in section.items():
diff --git a/ansible/action_plugins/merge_yaml.py b/ansible/action_plugins/merge_yaml.py
index aa7e9499b..28f194a5d 100755
--- a/ansible/action_plugins/merge_yaml.py
+++ b/ansible/action_plugins/merge_yaml.py
@@ -31,7 +31,6 @@ except ImportError:
 
 from ansible import constants
 from ansible.plugins import action
-import six
 
 DOCUMENTATION = '''
 ---
@@ -149,7 +148,7 @@ class ActionModule(action.ActionBase):
 class Utils(object):
     @staticmethod
     def update_nested_conf(conf, update):
-        for k, v in six.iteritems(update):
+        for k, v in update.items():
             if isinstance(v, dict):
                 conf[k] = Utils.update_nested_conf(conf.get(k, {}), v)
             else: