summaryrefslogtreecommitdiff
path: root/openstackclient/volume/v1/snapshot.py
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2013-07-03 18:12:58 -0500
committerDean Troyer <dtroyer@gmail.com>2013-07-29 19:12:29 -0500
commitdfb0e3e3c1b5b5563279bebfe222ed4762f79494 (patch)
tree43ec155c36076ba0645d131bde62f7baeaae2ef2 /openstackclient/volume/v1/snapshot.py
parent65d2a14e3e834ce0c57c879ec7d42715058254bf (diff)
downloadpython-openstackclient-dfb0e3e3c1b5b5563279bebfe222ed4762f79494.tar.gz
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
Diffstat (limited to 'openstackclient/volume/v1/snapshot.py')
-rw-r--r--openstackclient/volume/v1/snapshot.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/openstackclient/volume/v1/snapshot.py b/openstackclient/volume/v1/snapshot.py
index 6055a4d8..d3a56b75 100644
--- a/openstackclient/volume/v1/snapshot.py
+++ b/openstackclient/volume/v1/snapshot.py
@@ -16,6 +16,7 @@
"""Volume v1 Snapshot action implementations"""
import logging
+import six
import sys
from cliff import command
@@ -69,7 +70,7 @@ class CreateSnapshot(show.ShowOne):
parsed_args.description
)
- return zip(*sorted(snapshot._info.iteritems()))
+ return zip(*sorted(six.iteritems(snapshot._info)))
class DeleteSnapshot(command.Command):
@@ -175,4 +176,4 @@ class ShowSnapshot(show.ShowOne):
snapshot = utils.find_resource(volume_client.volume_snapshots,
parsed_args.snapshot)
- return zip(*sorted(snapshot._info.iteritems()))
+ return zip(*sorted(six.iteritems(snapshot._info)))