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/identity/v2_0/role.py | |
| parent | 978c2e7dec712c1dd355cf9f5eb6a7270fa2c385 (diff) | |
| parent | dfb0e3e3c1b5b5563279bebfe222ed4762f79494 (diff) | |
| download | python-openstackclient-9ec1cf385ee1434ebdb13a9de2f35024925ff50f.tar.gz | |
Merge "Begin Python 3 compatability"
Diffstat (limited to 'openstackclient/identity/v2_0/role.py')
| -rw-r--r-- | openstackclient/identity/v2_0/role.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py index 867230b6..61a83af5 100644 --- a/openstackclient/identity/v2_0/role.py +++ b/openstackclient/identity/v2_0/role.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 @@ """Role action implementations""" import logging +import six from cliff import command from cliff import lister @@ -61,7 +62,7 @@ class AddRole(show.ShowOne): info = {} info.update(role._info) - return zip(*sorted(info.iteritems())) + return zip(*sorted(six.iteritems(info))) class CreateRole(show.ShowOne): @@ -84,7 +85,7 @@ class CreateRole(show.ShowOne): info = {} info.update(role._info) - return zip(*sorted(info.iteritems())) + return zip(*sorted(six.iteritems(info))) class DeleteRole(command.Command): @@ -229,4 +230,4 @@ class ShowRole(show.ShowOne): info = {} info.update(role._info) - return zip(*sorted(info.iteritems())) + return zip(*sorted(six.iteritems(info))) |