summaryrefslogtreecommitdiff
path: root/openstackclient/identity/v3/endpoint.py
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2013-07-03 18:12:58 -0500
committerDean Troyer <dtroyer@gmail.com>2013-07-29 19:12:29 -0500
commitdfb0e3e3c1b5b5563279bebfe222ed4762f79494 (patch)
tree43ec155c36076ba0645d131bde62f7baeaae2ef2 /openstackclient/identity/v3/endpoint.py
parent65d2a14e3e834ce0c57c879ec7d42715058254bf (diff)
downloadpython-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/v3/endpoint.py')
-rw-r--r--openstackclient/identity/v3/endpoint.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/openstackclient/identity/v3/endpoint.py b/openstackclient/identity/v3/endpoint.py
index c5f3ebad..43da07aa 100644
--- a/openstackclient/identity/v3/endpoint.py
+++ b/openstackclient/identity/v3/endpoint.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 Endpoint action implementations"""
import logging
+import six
import sys
from cliff import command
@@ -83,7 +84,7 @@ class CreateEndpoint(show.ShowOne):
info.update(endpoint._info)
info['service_name'] = service.name
info['service_type'] = service.type
- return zip(*sorted(info.iteritems()))
+ return zip(*sorted(six.iteritems(info)))
class DeleteEndpoint(command.Command):
@@ -239,4 +240,4 @@ class ShowEndpoint(show.ShowOne):
info.update(endpoint._info)
info['service_name'] = service.name
info['service_type'] = service.type
- return zip(*sorted(info.iteritems()))
+ return zip(*sorted(six.iteritems(info)))