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/flavor.py | |
| parent | 978c2e7dec712c1dd355cf9f5eb6a7270fa2c385 (diff) | |
| parent | dfb0e3e3c1b5b5563279bebfe222ed4762f79494 (diff) | |
| download | python-openstackclient-9ec1cf385ee1434ebdb13a9de2f35024925ff50f.tar.gz | |
Merge "Begin Python 3 compatability"
Diffstat (limited to 'openstackclient/compute/v2/flavor.py')
| -rw-r--r-- | openstackclient/compute/v2/flavor.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/openstackclient/compute/v2/flavor.py b/openstackclient/compute/v2/flavor.py index 4d53a412..d1d08d8d 100644 --- a/openstackclient/compute/v2/flavor.py +++ b/openstackclient/compute/v2/flavor.py @@ -1,4 +1,4 @@ -# Copyright 2013 OpenStack, LLC. +# Copyright 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 @@ """Flavor action implementations""" import logging +import six from cliff import command from cliff import lister @@ -110,7 +111,7 @@ class CreateFlavor(show.ShowOne): flavor = compute_client.flavors.create(*args)._info.copy() flavor.pop("links") - return zip(*sorted(flavor.iteritems())) + return zip(*sorted(six.iteritems(flavor))) class DeleteFlavor(command.Command): @@ -182,4 +183,4 @@ class ShowFlavor(show.ShowOne): parsed_args.flavor)._info.copy() flavor.pop("links") - return zip(*sorted(flavor.iteritems())) + return zip(*sorted(six.iteritems(flavor))) |