Merge "Drop python 2 support from action plugins"

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
 

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:

requirements.txt

@@ -4,7 +4,6 @@
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 docker>=2.4.2 # Apache-2.0
 Jinja2>=2.10 # BSD License (3 clause)
-six>=1.10.0 # MIT
 oslo.config>=5.2.0 # Apache-2.0
 oslo.utils>=3.33.0 # Apache-2.0
 setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=21.0.0 # PSF/ZPL

tests/test_merge_config.py

@@ -17,9 +17,9 @@ import imp
 import os
 import sys
 
+from io import StringIO
 import mock
 from oslotest import base
-from six import StringIO
 
 
 PROJECT_DIR = os.path.abspath(os.path.join(os. path.dirname(__file__), '../'))