diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-31 15:05:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-31 15:05:01 +0000 |
| commit | 9ec1cf385ee1434ebdb13a9de2f35024925ff50f (patch) | |
| tree | 495076c963b22e72aa9f20f18cad1fdf0983f6ce /openstackclient/compute/v2/console.py | |
| parent | 978c2e7dec712c1dd355cf9f5eb6a7270fa2c385 (diff) | |
| parent | dfb0e3e3c1b5b5563279bebfe222ed4762f79494 (diff) | |
| download | python-openstackclient-9ec1cf385ee1434ebdb13a9de2f35024925ff50f.tar.gz | |
Merge "Begin Python 3 compatability"
Diffstat (limited to 'openstackclient/compute/v2/console.py')
| -rw-r--r-- | openstackclient/compute/v2/console.py | 7 |
1 files changed, 3 insertions, 4 deletions
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))) |