summaryrefslogtreecommitdiff
path: root/openstackclient/volume/v1/backup.py
diff options
context:
space:
mode:
Diffstat (limited to 'openstackclient/volume/v1/backup.py')
-rw-r--r--openstackclient/volume/v1/backup.py7
1 files changed, 4 insertions, 3 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)))