Merge "Begin Python 3 compatability"

4 files changed, 12 insertions, 8 deletions

diff --git a/openstackclient/volume/v1/backup.py b/openstackclient/volume/v1/backup.py
index 8ef666c1..dbf6eb73 100644
--- a/openstackclient/volume/v1/backup.py
+++ b/openstackclient/volume/v1/backup.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 @@
 """Volume v1 Backup action implementations"""
 
 import logging
+import six
 
 from cliff import command
 from cliff import lister
@@ -68,7 +69,7 @@ class CreateBackup(show.ShowOne):
         )
 
         backup._info.pop('links')
-        return zip(*sorted(backup._info.iteritems()))
+        return zip(*sorted(six.iteritems(backup._info)))
 
 
 class DeleteBackup(command.Command):
@@ -163,4 +164,4 @@ class ShowBackup(show.ShowOne):
         backup = utils.find_resource(volume_client.backups,
                                      parsed_args.backup)
         backup._info.pop('links')
-        return zip(*sorted(backup._info.iteritems()))
+        return zip(*sorted(six.iteritems(backup._info)))
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)))
diff --git a/openstackclient/volume/v1/type.py b/openstackclient/volume/v1/type.py
index 895f2377..ecf22781 100644
--- a/openstackclient/volume/v1/type.py
+++ b/openstackclient/volume/v1/type.py
@@ -16,6 +16,7 @@
 """Volume v1 Type action implementations"""
 
 import logging
+import six
 
 from cliff import command
 from cliff import lister
@@ -62,7 +63,7 @@ class CreateVolumeType(show.ShowOne):
 
         info = {}
         info.update(volume_type._info)
-        return zip(*sorted(info.iteritems()))
+        return zip(*sorted(six.iteritems(info)))
 
 
 class DeleteVolumeType(command.Command):
diff --git a/openstackclient/volume/v1/volume.py b/openstackclient/volume/v1/volume.py
index b74fe452..97f8d31d 100644
--- a/openstackclient/volume/v1/volume.py
+++ b/openstackclient/volume/v1/volume.py
@@ -16,6 +16,7 @@
 """Volume v1 Volume action implementations"""
 
 import logging
+import six
 
 from cliff import command
 from cliff import lister
@@ -124,7 +125,7 @@ class CreateVolume(show.ShowOne):
             {'properties': utils.format_dict(volume._info.pop('metadata'))}
         )
 
-        return zip(*sorted(volume._info.iteritems()))
+        return zip(*sorted(six.iteritems(volume._info)))
 
 
 class DeleteVolume(command.Command):
@@ -322,7 +323,7 @@ class ShowVolume(show.ShowOne):
             {'properties': utils.format_dict(volume._info.pop('metadata'))}
         )
 
-        return zip(*sorted(volume._info.iteritems()))
+        return zip(*sorted(six.iteritems(volume._info)))
 
 
 class UnsetVolume(command.Command):