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/v3/role.py | |
| parent | 978c2e7dec712c1dd355cf9f5eb6a7270fa2c385 (diff) | |
| parent | dfb0e3e3c1b5b5563279bebfe222ed4762f79494 (diff) | |
| download | python-openstackclient-9ec1cf385ee1434ebdb13a9de2f35024925ff50f.tar.gz | |
Merge "Begin Python 3 compatability"
Diffstat (limited to 'openstackclient/identity/v3/role.py')
| -rw-r--r-- | openstackclient/identity/v3/role.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py index 9be3b784..5403d4cb 100644 --- a/openstackclient/identity/v3/role.py +++ b/openstackclient/identity/v3/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 @@ """Identity v3 Role action implementations""" import logging +import six import sys from cliff import command @@ -123,7 +124,7 @@ class CreateRole(show.ShowOne): identity_client = self.app.client_manager.identity role = identity_client.roles.create(parsed_args.name) - return zip(*sorted(role._info.iteritems())) + return zip(*sorted(six.iteritems(role._info))) class DeleteRole(command.Command): @@ -296,4 +297,4 @@ class ShowRole(show.ShowOne): role = utils.find_resource(identity_client.roles, parsed_args.role) - return zip(*sorted(role._info.iteritems())) + return zip(*sorted(six.iteritems(role._info))) |