Merge "Begin Python 3 compatability"

7 files changed, 22 insertions, 18 deletions

diff --git a/openstackclient/compute/v2/agent.py b/openstackclient/compute/v2/agent.py
index aac69d8a..b79ebbe7 100644
--- a/openstackclient/compute/v2/agent.py
+++ b/openstackclient/compute/v2/agent.py
@@ -1,4 +1,4 @@
-#   Copyright 2013 OpenStack, LLC.
+#   Copyright 2013 OpenStack Foundation
 #
 #   Licensed under the Apache License, Version 2.0 (the "License"); you may
 #   not use this file except in compliance with the License. You may obtain
@@ -16,6 +16,7 @@
 """Agent action implementations"""
 
 import logging
+import six
 
 from cliff import command
 from cliff import lister
@@ -70,7 +71,7 @@ class CreateAgent(show.ShowOne):
             parsed_args.hypervisor
         )
         agent = compute_client.agents.create(*args)._info.copy()
-        return zip(*sorted(agent.iteritems()))
+        return zip(*sorted(six.iteritems(agent)))
 
 
 class DeleteAgent(command.Command):
@@ -160,4 +161,4 @@ class SetAgent(show.ShowOne):
             parsed_args.md5hash
         )
         agent = compute_client.agents.update(*args)._info.copy()
-        return zip(*sorted(agent.iteritems()))
+        return zip(*sorted(six.iteritems(agent)))
diff --git a/openstackclient/compute/v2/console.py b/openstackclient/compute/v2/console.py
index a67b004c..8f49c513 100644
--- a/openstackclient/compute/v2/console.py
+++ b/openstackclient/compute/v2/console.py
@@ -13,9 +13,10 @@
 #   under the License.
 #
 
-"""Console action implementations"""
+"""Compute v2 Console action implementations"""
 
 import logging
+import six
 import sys
 
 from cliff import command
@@ -106,7 +107,6 @@ class ShowConsoleURL(show.ShowOne):
             parsed_args.server,
         )
 
-        print "type: %s" % parsed_args.url_type
         if parsed_args.url_type in ['novnc', 'xvpvnc']:
             data = server.get_vnc_console(parsed_args.url_type)
         if parsed_args.url_type in ['spice']:
@@ -114,8 +114,7 @@ class ShowConsoleURL(show.ShowOne):
 
         if not data:
             return ({}, {})
-        print "data: %s" % data['console']
 
         info = {}
         info.update(data['console'])
-        return zip(*sorted(info.iteritems()))
+        return zip(*sorted(six.iteritems(info)))
diff --git a/openstackclient/compute/v2/flavor.py b/openstackclient/compute/v2/flavor.py
index 4d53a412..d1d08d8d 100644
--- a/openstackclient/compute/v2/flavor.py
+++ b/openstackclient/compute/v2/flavor.py
@@ -1,4 +1,4 @@
-#   Copyright 2013 OpenStack, LLC.
+#   Copyright 2013 OpenStack Foundation
 #
 #   Licensed under the Apache License, Version 2.0 (the "License"); you may
 #   not use this file except in compliance with the License. You may obtain
@@ -16,6 +16,7 @@
 """Flavor action implementations"""
 
 import logging
+import six
 
 from cliff import command
 from cliff import lister
@@ -110,7 +111,7 @@ class CreateFlavor(show.ShowOne):
         flavor = compute_client.flavors.create(*args)._info.copy()
         flavor.pop("links")
 
-        return zip(*sorted(flavor.iteritems()))
+        return zip(*sorted(six.iteritems(flavor)))
 
 
 class DeleteFlavor(command.Command):
@@ -182,4 +183,4 @@ class ShowFlavor(show.ShowOne):
                                      parsed_args.flavor)._info.copy()
         flavor.pop("links")
 
-        return zip(*sorted(flavor.iteritems()))
+        return zip(*sorted(six.iteritems(flavor)))
diff --git a/openstackclient/compute/v2/floatingip.py b/openstackclient/compute/v2/floatingip.py
index 1b07beb3..7ed847f5 100644
--- a/openstackclient/compute/v2/floatingip.py
+++ b/openstackclient/compute/v2/floatingip.py
@@ -16,6 +16,7 @@
 """Floating IP action implementations"""
 
 import logging
+import six
 
 from cliff import command
 from cliff import lister
@@ -75,7 +76,7 @@ class CreateFloatingIP(show.ShowOne):
 
         info = {}
         info.update(floating_ip._info)
-        return zip(*sorted(info.iteritems()))
+        return zip(*sorted(six.iteritems(info)))
 
 
 class DeleteFloatingIP(command.Command):
diff --git a/openstackclient/compute/v2/hypervisor.py b/openstackclient/compute/v2/hypervisor.py
index ad69d328..535062e8 100644
--- a/openstackclient/compute/v2/hypervisor.py
+++ b/openstackclient/compute/v2/hypervisor.py
@@ -16,6 +16,7 @@
 """Hypervisor action implementations"""
 
 import logging
+import six
 
 from cliff import lister
 from cliff import show
@@ -79,4 +80,4 @@ class ShowHypervisor(show.ShowOne):
         hypervisor["service_host"] = hypervisor["service"]["host"]
         del hypervisor["service"]
 
-        return zip(*sorted(hypervisor.iteritems()))
+        return zip(*sorted(six.iteritems(hypervisor)))
diff --git a/openstackclient/compute/v2/keypair.py b/openstackclient/compute/v2/keypair.py
index 65f3679b..d68dae06 100644
--- a/openstackclient/compute/v2/keypair.py
+++ b/openstackclient/compute/v2/keypair.py
@@ -17,6 +17,7 @@
 
 import logging
 import os
+import six
 import sys
 
 from cliff import command
@@ -71,7 +72,7 @@ class CreateKeypair(show.ShowOne):
         if public_key:
             info.update(keypair._info)
             del info['public_key']
-            return zip(*sorted(info.iteritems()))
+            return zip(*sorted(six.iteritems(info)))
         else:
             sys.stdout.write(keypair.private_key)
             return ({}, {})
@@ -148,7 +149,7 @@ class ShowKeypair(show.ShowOne):
         info.update(keypair._info['keypair'])
         if not parsed_args.public_key:
             del info['public_key']
-            return zip(*sorted(info.iteritems()))
+            return zip(*sorted(six.iteritems(info)))
         else:
             # NOTE(dtroyer): a way to get the public key in a similar form
             #                as the private key in the create command
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index eb4ccaba..793461eb 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -294,7 +294,7 @@ class CreateServer(show.ShowOne):
             # NOTE(vish): multiple copies of the same hint will
             #             result in a list of values
             if key in hints:
-                if isinstance(hints[key], basestring):
+                if isinstance(hints[key], six.string_types):
                     hints[key] = [hints[key]]
                 hints[key] += [value]
             else:
@@ -344,7 +344,7 @@ class CreateServer(show.ShowOne):
                 raise SystemExit
 
         details = _prep_server_detail(compute_client, server)
-        return zip(*sorted(details.iteritems()))
+        return zip(*sorted(six.iteritems(details)))
 
 
 class DeleteServer(command.Command):
@@ -729,7 +729,7 @@ class RebuildServer(show.ShowOne):
                 raise SystemExit
 
         details = _prep_server_detail(compute_client, server)
-        return zip(*sorted(details.iteritems()))
+        return zip(*sorted(six.iteritems(details)))
 
 
 class RemoveServerVolume(command.Command):
@@ -975,7 +975,7 @@ class ShowServer(show.ShowOne):
         else:
             data = _prep_server_detail(compute_client, server)
 
-        return zip(*sorted(data.iteritems()))
+        return zip(*sorted(six.iteritems(data)))
 
 
 class SshServer(command.Command):