Begin Python 3 compatability

* use six.iteritems()
* replace basestring with six.string_types
* convert print statements to functions (they're all debugging and should
  be removed eventually anyway)

* clean up OpenStack copyright: LLC -> Foundation

Change-Id: Icb14212bcb408e63816bfec3922a697bc1a6c946

Author: Dean Troyer

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 @@ def take_action(self, parsed_args):
             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 @@ def take_action(self, parsed_args):
             parsed_args.md5hash
         )
         agent = compute_client.agents.update(*args)._info.copy()
-        return zip(*sorted(agent.iteritems()))
+        return zip(*sorted(six.iteritems(agent)))

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,16 +107,14 @@ def take_action(self, parsed_args):
             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']:
             data = server.get_spice_console(parsed_args.url_type)
 
         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)))

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 @@ def take_action(self, parsed_args):
         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 @@ def take_action(self, parsed_args):
                                      parsed_args.flavor)._info.copy()
         flavor.pop("links")
 
-        return zip(*sorted(flavor.iteritems()))
+        return zip(*sorted(six.iteritems(flavor)))

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 @@ def take_action(self, parsed_args):
 
         info = {}
         info.update(floating_ip._info)
-        return zip(*sorted(info.iteritems()))
+        return zip(*sorted(six.iteritems(info)))
 
 
 class DeleteFloatingIP(command.Command):

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 @@ def take_action(self, parsed_args):
         hypervisor["service_host"] = hypervisor["service"]["host"]
         del hypervisor["service"]
 
-        return zip(*sorted(hypervisor.iteritems()))
+        return zip(*sorted(six.iteritems(hypervisor)))

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 @@ def take_action(self, parsed_args):
         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 @@ def take_action(self, parsed_args):
         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

openstackclient/compute/v2/server.py

@@ -293,7 +293,7 @@ def take_action(self, parsed_args):
             # 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:
@@ -343,7 +343,7 @@ def take_action(self, parsed_args):
                 raise SystemExit
 
         details = _prep_server_detail(compute_client, server)
-        return zip(*sorted(details.iteritems()))
+        return zip(*sorted(six.iteritems(details)))
 
 
 class DeleteServer(command.Command):
@@ -728,7 +728,7 @@ def take_action(self, parsed_args):
                 raise SystemExit
 
         details = _prep_server_detail(compute_client, server)
-        return zip(*sorted(details.iteritems()))
+        return zip(*sorted(six.iteritems(details)))
 
 
 class RemoveServerVolume(command.Command):
@@ -974,7 +974,7 @@ def take_action(self, parsed_args):
         else:
             data = _prep_server_detail(compute_client, server)
 
-        return zip(*sorted(data.iteritems()))
+        return zip(*sorted(six.iteritems(data)))
 
 
 class SuspendServer(command.Command):

openstackclient/identity/v2_0/ec2creds.py

@@ -1,3 +1,4 @@
+#   Copyright 2012 OpenStack Foundation
 #   Copyright 2013 Nebula Inc.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -13,9 +14,10 @@
 #   under the License.
 #
 
-"""EC2 Credentials action implementations"""
+"""Identity v2 EC2 Credentials action implementations"""
 
 import logging
+import six
 
 from cliff import command
 from cliff import lister
@@ -68,7 +70,7 @@ def take_action(self, parsed_args):
 
         info = {}
         info.update(creds._info)
-        return zip(*sorted(info.iteritems()))
+        return zip(*sorted(six.iteritems(info)))
 
 
 class DeleteEC2Creds(command.Command):
@@ -178,4 +180,4 @@ def take_action(self, parsed_args):
 
         info = {}
         info.update(creds._info)
-        return zip(*sorted(info.iteritems()))
+        return zip(*sorted(six.iteritems(info)))

openstackclient/identity/v2_0/endpoint.py

@@ -1,4 +1,4 @@
-#   Copyright 2012-2013 OpenStack, LLC.
+#   Copyright 2012-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 @@
 """Endpoint action implementations"""
 
 import logging
+import six
 
 from cliff import command
 from cliff import lister
@@ -71,7 +72,7 @@ def take_action(self, parsed_args):
         info.update(endpoint._info)
         info['service_name'] = service.name
         info['service_type'] = service.type
-        return zip(*sorted(info.iteritems()))
+        return zip(*sorted(six.iteritems(info)))
 
 
 class DeleteEndpoint(command.Command):
@@ -183,7 +184,7 @@ def take_action(self, parsed_args):
 
             url = identity_client.service_catalog.url_for(**kwargs)
             info = {'%s.%s' % (parsed_args.service, parsed_args.type): url}
-            return zip(*sorted(info.iteritems()))
+            return zip(*sorted(six.iteritems(info)))
         else:
             # The Identity 2.0 API doesn't support retrieving a single
             # endpoint so we have to do this ourselves
@@ -211,4 +212,4 @@ def take_action(self, parsed_args):
                                                   ep.service_id)
                     info['service_name'] = service.name
                     info['service_type'] = service.type
-                    return zip(*sorted(info.iteritems()))
+                    return zip(*sorted(six.iteritems(info)))

openstackclient/identity/v2_0/role.py

@@ -1,4 +1,4 @@
-#   Copyright 2012-2013 OpenStack, LLC.
+#   Copyright 2012-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 @@
 """Role action implementations"""
 
 import logging
+import six
 
 from cliff import command
 from cliff import lister
@@ -61,7 +62,7 @@ def take_action(self, parsed_args):
 
         info = {}
         info.update(role._info)
-        return zip(*sorted(info.iteritems()))
+        return zip(*sorted(six.iteritems(info)))
 
 
 class CreateRole(show.ShowOne):
@@ -84,7 +85,7 @@ def take_action(self, parsed_args):
 
         info = {}
         info.update(role._info)
-        return zip(*sorted(info.iteritems()))
+        return zip(*sorted(six.iteritems(info)))
 
 
 class DeleteRole(command.Command):
@@ -229,4 +230,4 @@ def take_action(self, parsed_args):
 
         info = {}
         info.update(role._info)
-        return zip(*sorted(info.iteritems()))
+        return zip(*sorted(six.iteritems(info)))