summaryrefslogtreecommitdiff
path: root/openstackclient/compute/v2/floatingip.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-07-31 15:05:01 +0000
committerGerrit Code Review <review@openstack.org>2013-07-31 15:05:01 +0000
commit9ec1cf385ee1434ebdb13a9de2f35024925ff50f (patch)
tree495076c963b22e72aa9f20f18cad1fdf0983f6ce /openstackclient/compute/v2/floatingip.py
parent978c2e7dec712c1dd355cf9f5eb6a7270fa2c385 (diff)
parentdfb0e3e3c1b5b5563279bebfe222ed4762f79494 (diff)
downloadpython-openstackclient-9ec1cf385ee1434ebdb13a9de2f35024925ff50f.tar.gz
Merge "Begin Python 3 compatability"
Diffstat (limited to 'openstackclient/compute/v2/floatingip.py')
-rw-r--r--openstackclient/compute/v2/floatingip.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/openstackclient/compute/v2/floatingip.py b/openstackclient/compute/v2/floatingip.py
index 1b07beb3..7ed847f5 100644
--- a/openstackclient/compute/v2/floatingip.py
+++ b/openstackclient/compute/v2/floatingip.py
@@ -16,6 +16,7 @@
"""Floating IP action implementations"""
import logging
+import six
from cliff import command
from cliff import lister
@@ -75,7 +76,7 @@ class CreateFloatingIP(show.ShowOne):
info = {}
info.update(floating_ip._info)
- return zip(*sorted(info.iteritems()))
+ return zip(*sorted(six.iteritems(info)))
class DeleteFloatingIP(command.Command):