Merge "py3:Rmove six.iteritems/iterkeys in python-senlinclient"

senlinclient/tests/unit/v1/fakes.py

@@ -141,7 +141,7 @@ class FakeResource(object):
         self._loaded = loaded
 
     def _add_details(self, info):
-        for (k, v) in six.iteritems(info):
+        for (k, v) in info.items():
             setattr(self, k, v)
 
     def __repr__(self):

senlinclient/v1/action.py

@@ -13,7 +13,6 @@
 """Clustering v1 action implementations"""
 
 import logging
-import six
 
 from openstack import exceptions as sdk_exc
 from osc_lib.command import command
@@ -142,6 +141,6 @@ class ShowAction(command.ShowOne):
             'depended_by': senlin_utils.list_formatter,
         }
         data = action.to_dict()
-        columns = sorted(list(six.iterkeys(data)))
+        columns = sorted(data.keys())
         return columns, utils.get_dict_properties(data, columns,
                                                   formatters=formatters)

senlinclient/v1/cluster.py

@@ -13,7 +13,6 @@
 """Clustering v1 cluster action implementations"""
 
 import logging
-import six
 import sys
 
 from openstack import exceptions as sdk_exc
@@ -136,7 +135,7 @@ def _show_cluster(senlin_client, cluster_id):
         'node_ids': senlin_utils.list_formatter
     }
     data = cluster.to_dict()
-    columns = sorted(list(six.iterkeys(data)))
+    columns = sorted(data.keys())
     return columns, utils.get_dict_properties(data, columns,
                                               formatters=formatters)
 

senlinclient/v1/cluster_policy.py

@@ -13,7 +13,6 @@
 """Clustering v1 cluster policy action implementations"""
 
 import logging
-import six
 
 from osc_lib.command import command
 from osc_lib import utils
@@ -113,7 +112,7 @@ class ClusterPolicyShow(command.ShowOne):
         policy = senlin_client.get_cluster_policy(parsed_args.policy,
                                                   parsed_args.cluster)
         data = policy.to_dict()
-        columns = sorted(list(six.iterkeys(data)))
+        columns = sorted(data.keys())
         return columns, utils.get_dict_properties(data, columns)
 
 

senlinclient/v1/event.py

@@ -13,7 +13,6 @@
 """Clustering v1 event action implementations"""
 
 import logging
-import six
 
 from openstack import exceptions as sdk_exc
 from osc_lib.command import command
@@ -128,5 +127,5 @@ class ShowEvent(command.ShowOne):
             raise exc.CommandError(_("Event not found: %s")
                                    % parsed_args.event)
         data = event.to_dict()
-        columns = sorted(list(six.iterkeys(data)))
+        columns = sorted(data.keys())
         return columns, utils.get_dict_properties(data, columns)

senlinclient/v1/node.py

@@ -13,7 +13,6 @@
 """Clustering v1 node action implementations"""
 
 import logging
-import six
 import sys
 
 from openstack import exceptions as sdk_exc
@@ -159,7 +158,7 @@ def _show_node(senlin_client, node_id, show_details=False):
     if show_details and data['details']:
         formatters['details'] = senlin_utils.nested_dict_formatter(
             list(data['details'].keys()), ['property', 'value'])
-    columns = sorted(list(six.iterkeys(data)))
+    columns = sorted(data.keys())
     return columns, utils.get_dict_properties(data, columns,
                                               formatters=formatters)
 

senlinclient/v1/policy_type.py

@@ -13,7 +13,6 @@
 """Clustering v1 policy type action implementations"""
 
 import logging
-import six
 
 from openstack import exceptions as sdk_exc
 from osc_lib.command import command
@@ -65,6 +64,6 @@ class PolicyTypeShow(format_utils.YamlFormat):
             raise exc.CommandError(_('Policy Type not found: %s')
                                    % parsed_args.type_name)
         data = res.to_dict()
-        rows = list(six.itervalues(data))
+        rows = data.values()
-        columns = list(six.iterkeys(data))
+        columns = data.keys()
         return columns, rows

senlinclient/v1/profile_type.py

@@ -13,7 +13,6 @@
 """Clustering v1 profile type action implementations"""
 
 import logging
-import six
 
 from openstack import exceptions as sdk_exc
 from osc_lib.command import command
@@ -64,6 +63,6 @@ class ProfileTypeShow(format_utils.YamlFormat):
             raise exc.CommandError(_('Profile Type not found: %s')
                                    % parsed_args.type_name)
         data = res.to_dict()
-        rows = list(six.itervalues(data))
+        rows = data.values()
-        columns = list(six.iterkeys(data))
+        columns = data.keys()
         return columns, rows

senlinclient/v1/receiver.py

@@ -13,7 +13,6 @@
 """Clustering v1 receiver action implementations"""
 
 import logging
-import six
 import sys
 
 from openstack import exceptions as sdk_exc
@@ -141,7 +140,7 @@ def _show_receiver(senlin_client, receiver_id):
         'channel': senlin_utils.json_formatter,
     }
     data = receiver.to_dict()
-    columns = sorted(list(six.iterkeys(data)))
+    columns = sorted(data.keys())
     return columns, utils.get_dict_properties(data, columns,
                                               formatters=formatters)