Replace six.iteritems() with .items()

1. As mentioned in [1], we should avoid using six.iteritems to achieve
   iterators. We can use dict.items instead, as it will return iterators
   in PY3 as well. And dict.items/keys will more readable.

2. In py2, the performance about list should be negligible,
   see the link [2].

[1] https://wiki.openstack.org/wiki/Python3
[2] http://lists.openstack.org/pipermail/openstack-dev/2015-June/066391.html

Co-Authored-By: Akihiro Motoki <amotoki@gmail.com>
Change-Id: I4b9edb326444264c0f6c4ad281acaac356a07e85
Implements: blueprint replace-iteritems-with-items

Author: lihaijing

HACKING.rst

@@ -93,8 +93,7 @@ OpenStackClient strives to be Python 3.3 compatible.  Common guidelines:
 
 * Convert print statements to functions: print statements should be converted
   to an appropriate log or other output mechanism.
-* Use six where applicable: x.iteritems is converted to six.iteritems(x)
-  for example.
+* Prefer to x.items() over six.iteritems(x).
 
 Running Tests
 -------------

openstackclient/api/object_store_v1.py

@@ -19,7 +19,6 @@
 import sys
 
 from osc_lib import utils
-import six
 from six.moves import urllib
 
 from openstackclient.api import api
@@ -559,7 +558,7 @@ def _set_properties(self, properties, header_tag):
         log = logging.getLogger(__name__ + '._set_properties')
 
         headers = {}
-        for k, v in six.iteritems(properties):
+        for k, v in properties.items():
             if not utils.is_ascii(k) or not utils.is_ascii(v):
                 log.error('Cannot set property %s to non-ascii value', k)
                 continue
@@ -572,7 +571,7 @@ def _get_properties(self, headers, header_tag):
         # Add in properties as a top level key, this is consistent with other
         # OSC commands
         properties = {}
-        for k, v in six.iteritems(headers):
+        for k, v in headers.items():
             if k.lower().startswith(header_tag):
                 properties[k[len(header_tag):]] = v
         return properties

openstackclient/common/availability_zone.py

@@ -19,7 +19,6 @@
 from novaclient import exceptions as nova_exceptions
 from osc_lib.command import command
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 
@@ -47,11 +46,11 @@ def _xform_compute_availability_zone(az, include_extra):
         return result
 
     if hasattr(az, 'hosts') and az.hosts:
-        for host, services in six.iteritems(az.hosts):
+        for host, services in az.hosts.items():
             host_info = copy.deepcopy(zone_info)
             host_info['host_name'] = host
 
-            for svc, state in six.iteritems(services):
+            for svc, state in services.items():
                 info = copy.deepcopy(host_info)
                 info['service_name'] = svc
                 info['service_status'] = '%s %s %s' % (

openstackclient/common/configuration.py

@@ -15,7 +15,6 @@
 
 from keystoneauth1.loading import base
 from osc_lib.command import command
-import six
 
 from openstackclient.i18n import _
 
@@ -59,9 +58,9 @@ def take_action(self, parsed_args):
                 if o.secret
             ]
 
-        for key, value in six.iteritems(info.pop('auth', {})):
+        for key, value in info.pop('auth', {}).items():
             if parsed_args.mask and key.lower() in secret_opts:
                 value = REDACTED
             info['auth.' + key] = value
 
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))

openstackclient/common/module.py

@@ -19,7 +19,6 @@
 
 from osc_lib.command import command
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 
@@ -113,4 +112,4 @@ def take_action(self, parsed_args):
                         # Catch all exceptions, just skip it
                         pass
 
-        return zip(*sorted(six.iteritems(data)))
+        return zip(*sorted(data.items()))

openstackclient/common/quota.py

@@ -21,7 +21,6 @@
 
 from osc_lib.command import command
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 from openstackclient.network import common
@@ -663,4 +662,4 @@ def take_action(self, parsed_args):
             project_name = project_info['name']
             info['project_name'] = project_name
 
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))

openstackclient/compute/v2/agent.py

@@ -20,7 +20,6 @@
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 
@@ -77,7 +76,7 @@ def take_action(self, parsed_args):
             parsed_args.hypervisor
         )
         agent = compute_client.agents.create(*args)._info.copy()
-        return zip(*sorted(six.iteritems(agent)))
+        return zip(*sorted(agent.items()))
 
 
 class DeleteAgent(command.Command):

openstackclient/compute/v2/aggregate.py

@@ -23,7 +23,6 @@
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 
@@ -68,7 +67,7 @@ def take_action(self, parsed_args):
                 'properties': format_columns.DictColumn(info.pop('metadata')),
             },
         )
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
 
 
 class CreateAggregate(command.ShowOne):
@@ -125,7 +124,7 @@ def take_action(self, parsed_args):
                 'properties': properties,
             },
         )
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
 
 
 class DeleteAggregate(command.Command):
@@ -255,7 +254,7 @@ def take_action(self, parsed_args):
                 'properties': format_columns.DictColumn(info.pop('metadata')),
             },
         )
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
 
 
 class SetAggregate(command.Command):
@@ -372,7 +371,7 @@ def take_action(self, parsed_args):
 
         info = {}
         info.update(data._info)
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))
 
 
 class UnsetAggregate(command.Command):

openstackclient/compute/v2/console.py

@@ -18,7 +18,6 @@
 from osc_lib.cli import parseractions
 from osc_lib.command import command
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 
@@ -138,4 +137,4 @@ def take_action(self, parsed_args):
         #                 handle for different microversion API.
         console_data = data.get('remote_console', data.get('console'))
         info.update(console_data)
-        return zip(*sorted(six.iteritems(info)))
+        return zip(*sorted(info.items()))

openstackclient/compute/v2/flavor.py

@@ -22,7 +22,6 @@
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
@@ -195,7 +194,7 @@ def take_action(self, parsed_args):
         flavor_info.pop("links")
         flavor_info['properties'] = utils.format_dict(flavor.get_keys())
 
-        return zip(*sorted(six.iteritems(flavor_info)))
+        return zip(*sorted(flavor_info.items()))
 
 
 class DeleteFlavor(command.Command):
@@ -447,7 +446,7 @@ def take_action(self, parsed_args):
 
         flavor['properties'] = utils.format_dict(resource_flavor.get_keys())
 
-        return zip(*sorted(six.iteritems(flavor)))
+        return zip(*sorted(flavor.items()))
 
 
 class UnsetFlavor(command.Command):