Remove usage of six

With python3.x, classes can use 'metaclass=' instead of
'six.add_metaclass', 'six.iteritems' and 'six.iterkeys' can
be replaced by 'items' and 'keys', 'six.moves.urllib.parse'
can be replaced by 'urllib.parse', 'six.StringIO' and
'six.moves.cStringIO' can be replaced by 'io.StringIO',
'six.text_type' and 'six.string_type' are just 'str'.

Change-Id: I84848c0bf8ab3c36dd821141191e2725e4e3b58b

1 files changed, 2 insertions, 3 deletions

diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 1d1fc741..756903f7 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -30,7 +30,6 @@ from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 from oslo_utils import timeutils
-import six
 
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
@@ -97,7 +96,7 @@ def _get_ip_address(addresses, address_type, ip_address_family):
     for network in addresses:
         for addy in addresses[network]:
             # Case where it is list of strings
-            if isinstance(addy, six.string_types):
+            if isinstance(addy, str):
                 if new_address_type == 'fixed':
                     return addresses[network][0]
                 else:
@@ -876,7 +875,7 @@ class CreateServer(command.ShowOne):
         boot_args = [parsed_args.server_name, image, flavor]
 
         # Handle block device by device name order, like: vdb -> vdc -> vdd
-        for dev_name in sorted(six.iterkeys(parsed_args.block_device_mapping)):
+        for dev_name in sorted(parsed_args.block_device_mapping):
             dev_map = parsed_args.block_device_mapping[dev_name]
             dev_map = dev_map.split(':')
             if dev_map[0]: