summaryrefslogtreecommitdiff
path: root/openstackclient/volume/v1/snapshot.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-07-31 15:05:01 +0000
committerGerrit Code Review <review@openstack.org>2013-07-31 15:05:01 +0000
commit9ec1cf385ee1434ebdb13a9de2f35024925ff50f (patch)
tree495076c963b22e72aa9f20f18cad1fdf0983f6ce /openstackclient/volume/v1/snapshot.py
parent978c2e7dec712c1dd355cf9f5eb6a7270fa2c385 (diff)
parentdfb0e3e3c1b5b5563279bebfe222ed4762f79494 (diff)
downloadpython-openstackclient-9ec1cf385ee1434ebdb13a9de2f35024925ff50f.tar.gz
Merge "Begin Python 3 compatability"
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)))