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

4 files changed, 5 insertions, 9 deletions

diff --git a/openstackclient/network/sdk_utils.py b/openstackclient/network/sdk_utils.py
index 9f085617..af9c74f9 100644
--- a/openstackclient/network/sdk_utils.py
+++ b/openstackclient/network/sdk_utils.py
@@ -10,8 +10,6 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-import six
-
 
 def get_osc_show_columns_for_sdk_resource(
     sdk_resource,
@@ -44,7 +42,7 @@ def get_osc_show_columns_for_sdk_resource(
     for col_name in invisible_columns:
         if col_name in display_columns:
             display_columns.remove(col_name)
-    for sdk_attr, osc_attr in six.iteritems(osc_column_map):
+    for sdk_attr, osc_attr in osc_column_map.items():
         if sdk_attr in display_columns:
             attr_map[osc_attr] = sdk_attr
             display_columns.remove(sdk_attr)
diff --git a/openstackclient/network/v2/network_segment_range.py b/openstackclient/network/v2/network_segment_range.py
index f03bcc1c..2cdae642 100644
--- a/openstackclient/network/v2/network_segment_range.py
+++ b/openstackclient/network/v2/network_segment_range.py
@@ -61,7 +61,7 @@ def _is_prop_empty(columns, props, prop_name):
 
 def _exchange_dict_keys_with_values(orig_dict):
     updated_dict = dict()
-    for k, v in six.iteritems(orig_dict):
+    for k, v in orig_dict.items():
         k = [k]
         if not updated_dict.get(v):
             updated_dict[v] = k
@@ -80,7 +80,7 @@ def _update_available_from_props(columns, props):
 def _update_used_from_props(columns, props):
     index_used = columns.index('used')
     updated_used = _exchange_dict_keys_with_values(props[index_used])
-    for k, v in six.iteritems(updated_used):
+    for k, v in updated_used.items():
         updated_used[k] = list(_get_ranges(v))
     props = _hack_tuple_value_update_by_index(
         props, index_used, updated_used)
diff --git a/openstackclient/network/v2/security_group.py b/openstackclient/network/v2/security_group.py
index 9f0ca0a1..24f71ab6 100644
--- a/openstackclient/network/v2/security_group.py
+++ b/openstackclient/network/v2/security_group.py
@@ -19,7 +19,6 @@ from cliff import columns as cliff_columns
 from osc_lib.cli import format_columns
 from osc_lib.command import command
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
@@ -34,7 +33,7 @@ def _format_network_security_group_rules(sg_rules):
     # rules, trim keys with caller known (e.g. security group and tenant ID)
     # or empty values.
     for sg_rule in sg_rules:
-        empty_keys = [k for k, v in six.iteritems(sg_rule) if not v]
+        empty_keys = [k for k, v in sg_rule.items() if not v]
         for key in empty_keys:
             sg_rule.pop(key)
         sg_rule.pop('security_group_id', None)
diff --git a/openstackclient/network/v2/security_group_rule.py b/openstackclient/network/v2/security_group_rule.py
index a38587fa..f48478ea 100644
--- a/openstackclient/network/v2/security_group_rule.py
+++ b/openstackclient/network/v2/security_group_rule.py
@@ -20,7 +20,6 @@ from osc_lib.cli import format_columns
 from osc_lib.cli import parseractions
 from osc_lib import exceptions
 from osc_lib import utils
-import six
 
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
@@ -39,7 +38,7 @@ _formatters = {
 
 def _format_security_group_rule_show(obj):
     data = network_utils.transform_compute_security_group_rule(obj)
-    return zip(*sorted(six.iteritems(data)))
+    return zip(*sorted(data.items()))
 
 
 def _format_network_port_range(rule):