From dfb0e3e3c1b5b5563279bebfe222ed4762f79494 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Wed, 3 Jul 2013 18:12:58 -0500
Subject: 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
---
 openstackclient/compute/v2/console.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'openstackclient/compute/v2/console.py')

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)))
-- 
cgit v1.2.1