diff options
| author | Dean Troyer <dtroyer@gmail.com> | 2013-07-03 18:12:58 -0500 |
|---|---|---|
| committer | Dean Troyer <dtroyer@gmail.com> | 2013-07-29 19:12:29 -0500 |
| commit | dfb0e3e3c1b5b5563279bebfe222ed4762f79494 (patch) | |
| tree | 43ec155c36076ba0645d131bde62f7baeaae2ef2 /openstackclient/identity/v2_0/ec2creds.py | |
| parent | 65d2a14e3e834ce0c57c879ec7d42715058254bf (diff) | |
| download | python-openstackclient-dfb0e3e3c1b5b5563279bebfe222ed4762f79494.tar.gz | |
Begin Python 3 compatability
* use six.iteritems()
* replace basestring with six.string_types
* convert print statements to functions (they're all debugging and should
be removed eventually anyway)
* clean up OpenStack copyright: LLC -> Foundation
Change-Id: Icb14212bcb408e63816bfec3922a697bc1a6c946
Diffstat (limited to 'openstackclient/identity/v2_0/ec2creds.py')
| -rw-r--r-- | openstackclient/identity/v2_0/ec2creds.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/openstackclient/identity/v2_0/ec2creds.py b/openstackclient/identity/v2_0/ec2creds.py index 953a3de6..cb3a5165 100644 --- a/openstackclient/identity/v2_0/ec2creds.py +++ b/openstackclient/identity/v2_0/ec2creds.py @@ -1,3 +1,4 @@ +# Copyright 2012 OpenStack Foundation # Copyright 2013 Nebula Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -13,9 +14,10 @@ # under the License. # -"""EC2 Credentials action implementations""" +"""Identity v2 EC2 Credentials action implementations""" import logging +import six from cliff import command from cliff import lister @@ -68,7 +70,7 @@ class CreateEC2Creds(show.ShowOne): info = {} info.update(creds._info) - return zip(*sorted(info.iteritems())) + return zip(*sorted(six.iteritems(info))) class DeleteEC2Creds(command.Command): @@ -178,4 +180,4 @@ class ShowEC2Creds(show.ShowOne): info = {} info.update(creds._info) - return zip(*sorted(info.iteritems())) + return zip(*sorted(six.iteritems(info))) |